[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 am: 942b39d0 -s ours
am: cfbb2382 -s ours
am skip reason: change_id I8f7bd7a6a0562942ed3e12f28705043722d177e8 with SHA1 65c96f2f is in history

Change-Id: Ia3ce840ed4f47c86bef1f3f8db3509ab96a41a1f