Merge "AOD: Fix navbar flicker when transitioning to AOD" into oc-dr1-dev