Merge "[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: 3518b5caef -s ours
am: f9738f6cf3 -s ours
am skip reason: subject contains skip directive

Change-Id: I4d29289efc123bc93c3bb2a54fbc0364a18977bf