Merge "Migrate PrimarySwitchPreference to SwitchCompat" into main