Merge "Prevent NPE in CoreSettingsObserverTest"