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

Change-Id: I68ac5b61d9e943346a62ed72fffe5650ce9cd2dd