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

Change-Id: I80a618eb59f0479060a69ca4f0be8ac883a8d48d