Merge "Migrate new() to SwitchPreferenceCompat" into main