Merge "AOD: Fix flicker at end of AOD2" into oc-dr1-dev