Merge "Attempted fix for navigation bar flicker" into oc-dev am: bbd7dfc0a4 am: 20eb74681f
am: bda5530d2a

Change-Id: I2f2b93c2c06a52fbed7b26ece806c7bc88238527