[automerger skipped] DO NOT MERGE: Fixed an issue where the notification icons wouldn't show while docked am: bdf71a0420
am: 1b9f1ad3d8 -s ours
am skip reason: change_id I8f7bd7a6a0562942ed3e12f28705043722d177e8 with SHA1 65c96f2fd4 is in history

Change-Id: I4103ed99271b9a027668c0b664718ee8b4b0cc82