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