Merge "Fixed a bug where the navigation notification would flicker" into oc-dev am: b18f65a168
am: ef711976c8

Change-Id: I8cf63a193d9b4cbf1cf62b48f051849d4e7158af