[automerger skipped] Merge "Showing the notification icon properly now when the pulse is suppressed" into qt-dev am: bb94263ca2
am: b6bb219d9e -s ours
am skip reason: change_id I8f7bd7a6a0562942ed3e12f28705043722d177e8 with SHA1 65c96f2fd4 is in history

Change-Id: Iaeea49439d8fef29be9689939128083b550ca0a8