[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 am: b6bb219d -s ours am: c2bbdf0b -s ours
am: 016086af -s ours
am skip reason: change_id I8f7bd7a6a0562942ed3e12f28705043722d177e8 with SHA1 65c96f2f is in history

Change-Id: I1da28e290e41c4d3fdbbf18869e9ab1330671a2d