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

* commit '99f27dc554c7937bc1afbcae0c40e364d025ca2d':
  Swap start/stop of SettingsObserver and InputDeviceListener