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

Change-Id: I68131f995f959f09d22ae638411c47ba74fe7ce4