[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: fe8ef8b8 -s ours
am skip reason: subject contains skip directive

Change-Id: I1f191fee3a8e2ef7566946e250a75559716547ac