Merge "Update CoreSettingsObserver internal state correctly."