Merge "Not checking for some anomalies when switching nav modes" into sc-v2-dev