Merge "Change the navigation application default to the new navigation application"