Merge "Swap start/stop of SettingsObserver and InputDeviceListener" into jb-dev-plus-aosp