Merge "[SettingsProvider] key size limit for mutating settings"