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

Change-Id: I385374ede44f09bb729ec7df7be13dc62c19bb2a