Merge "Migrate SyncStateSwitchPreference to SwitchPreferenceCompat" into main