Merge "Remove the suffix LEGACY from CLUSTER_NAVIGATION_STATE_LEGACY." into sc-dev