Merge "Migrate PrimarySwitchPreference to CompoundButton" into main