Merge "Fix a regression in SettingsProvider" into nyc-dev