Merge "Migrate Enhanced notifications to SwitchPreferenceCompat" into main