Merge "Fixed a issue where notification icons don't align vertically while...
Merge "Fixed a issue where notification icons don't align vertically while peeking" into pi-dev am: 118b1e3b
am: b64f0570
Change-Id: I4606bc3981f95d4bb3e675f192a30bf36b6c0816