Merge "Ensure the game mode setting doesn't conflict with available modes" into sc-dev