Merge "Add SystemSettingsRepository to customization tests" into main