am: e7f82ec533 * commit 'e7f82ec533b2d768f0f5c2249947d228059565d9': Fix a regression in SettingsProvider