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

Change-Id: I53abb4f31f8dc660ba9b140475bbd121df524613