Merge "Refactor AutomaticDataSwitchingPreference" into main