Merge "Fix flickery behavior when launching notification when occluded" into oc-dr1-dev am: dd22dcbc am: 6b46beea Change-Id: I98a42a909b011b7a888a6b6dc52caa18e95340d3