[automerger skipped] Merge "DO NOT MERGE: Fixed an issue where the...

[automerger skipped] Merge "DO NOT MERGE: Fixed an issue where the notification icons wouldn't show while docked" into qt-dev am: cceea08c -s ours am: 776d0367 -s ours
am: 3518b5ca -s ours
am skip reason: change_id I8f7bd7a6a0562942ed3e12f28705043722d177e8 with SHA1 65c96f2f is in history

Change-Id: I59032eba5f6d2f72cc8b77937d2104f0174cca32