[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 skip reason: change_id I8f7bd7a6a0562942ed3e12f28705043722d177e8 with SHA1 65c96f2f is in history

Change-Id: I3e6286e45c5f5abef7409f687d3d9bea16c67ea6