Merge "Fix SettingsProvider for use_resource_processor: true" into main