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

Change-Id: If0c31f46e4dd3e38f617f9660dd13d65b0a52569