Merge "Merge "Merge "Fixed a bug where the navigation notification would flicker" into oc-dev am: b18f65a168 am: ef711976c8" into oc-dr1-dev-plus-aosp am: 46c8c8dadf"