Merge "AOD: Delay removing AOD scrim after pulse" into oc-mr1-dev