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

Change-Id: I66814b15777b180596fd91ac8906f9df698a2d19