Merge "Update owners files for SettingsProvider" into main