Merge "RestrictedSwitchPreference edit" into main