* commit 'e7759cca2743ad04b81e44b3ad314d7b6c2417ca': Do not call out of the settings provider with a lock held