Merge pull request #22430 from colemanw/navigationDefaults