Merge "Use SwitchPreferenceCompat for UI consistency" into main