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

Change-Id: I6e25610a94fdf9dc59504171ee1f3a7b95685112