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

Change-Id: Id1b46b3c77f0cb2213afa38ba3e6608f091c4d8b