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

Change-Id: I9dc34fe898c8ce9f5c1babfa73bf619c0e69a494