Merge "Clean up SettingsTheme.colorScheme" into main