Merge "Fixed a bug where the navigation notification would flicker" into oc-dev am: b18f65a168 am: 1c28e96bf0
am: 8dbeb33bd8

Change-Id: I9db049f7c203434551d757886c35bdf5cfbac866