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

Change-Id: Iae70b03d22fa30b275a6af2477b08b1132b515eb