Merge "Showing the notification icon properly now when the pulse is suppressed" into qt-dev
am: bb94263ca2

Change-Id: Ibedcdda1079dc344e3e86205da3a0e738f51d5af