Merge "[SettingsProvider] mem limit should be checked before settings are updated"