Merge "Fixed an issue where notifications were invisible on AOD" into pi-dev am: d4115f501d
am: de932bdf90

Change-Id: Icdea366821e0365bce7115c4b2a34f9c22e0fb79