Merge "Improved the heads up experience when notifications were blocked" into qt-r1-dev
am: fc039930d1

Change-Id: Id9238aa220d40c2bd4405b35a889e6e78391fc10