Merge "Check NAVIGATION_NONAV in ActivityManagerService"