[automerger skipped] Merge "DO NOT MERGE: Fixed an issue where the notification icons wouldn't show while docked" into qt-dev am: cceea08cc7
am:942b39d0f6-s ours am skip reason: change_id I8f7bd7a6a0562942ed3e12f28705043722d177e8 with SHA165c96f2fd4is in history Change-Id: Ide77303b55855437055b078f9ca0de175bc1ac2e
This commit is contained in: