Merge "Add a way to clear cached provider for tests in Settings class."