Merge "Add null check to NavigationModeFeatureFlag" into sc-dev