Merge "Lazy load SettingsObserver"