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

Change-Id: Iafb33234e4c40a978852c349f26b46485d11395e