Merge "[SettingsProvider] allow null values in validators"