Merge "Merge "AOD: Fix navbar flicker when transitioning to AOD" into oc-dr1-dev am: 1cbfe74fc2 am: 1a623d4b96" into oc-mr1-dev-plus-aosp