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

Change-Id: I6b5c4ce303455e592ecb0e6c6bfcd238fbd8a7ef