[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: 9c2f21f6 -s ours am: e17adb94 -s ours
am: b2328f83 -s ours
am skip reason: change_id I8f7bd7a6a0562942ed3e12f28705043722d177e8 with SHA1 65c96f2f is in history

Change-Id: Ieec1773004fb7b51c669a9f450b40f7e1ca28525