Merge "Choose a fallback route when the current route is unselected" into mnc-ub-dev