Merge "Fix flickery behavior when launching notification when occluded" into oc-dr1-dev
am: dd22dcbcdf

Change-Id: I2760a5efce65ba88fcb49589eec9071fc052ddc9