Merge "AOD: Fix more flickering" into oc-dr1-dev