Merge "Fix flickery behavior when launching notification when occluded" into oc-dr1-dev am: dd22dcbc am: 147966d7 Change-Id: Ic14166198d1b44b87335f78bdab41b802fc23156