Merge "Add MainSwitchPreference support for Catalyst" into main