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