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

Change-Id: Id23121f6067fb8fafeb57c218673fc4e8b35fae9