Merge "SettingsProvider: defensively cap size of settings kept cached in memory."