Merge "AOD: Fix navbar flicker when transitioning to AOD" into oc-dr1-dev am: 1cbfe74fc2
am: 63953ef041

Change-Id: I847f62c42f0199ef2c5f694d3c4f498ac9f39658