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

Change-Id: I50d98b16eb4ce43a555a0136a74421e891754786