[automerger skipped] Merge "Showing the notification icon properly now when...
[automerger skipped] Merge "Showing the notification icon properly now when the pulse is suppressed" into qt-dev
am: bb94263c -s ours
am skip reason: change_id I8f7bd7a6a0562942ed3e12f28705043722d177e8 with SHA1 65c96f2f is in history
Change-Id: If8cd296781afafedeb4910fe87a83889a6ba2ec5