Merge "Fixed a issue where notification icons don't align vertically while peeking" into pi-dev am: 118b1e3bb8
am: b64f057045

Change-Id: I4606bc3981f95d4bb3e675f192a30bf36b6c0816