Merge "[SettingsProvider] reduce log spam" into udc-dev