Merge "Merge "Attempted fix for navigation bar flicker" into oc-dev am:...
Merge "Merge "Attempted fix for navigation bar flicker" into oc-dev am: bbd7dfc0 am: 78c9744f" into oc-dr1-dev-plus-aosp
am: 8f76d06c
Change-Id: Ibba2531d1fbf0b440fb19672b60938dd93cd40e2