Merge "AOD: Fix launching notifications from occluded AOD" into oc-dr1-dev