Merge changes I07dae5fb,Ibe0100bc

* changes:
  Tidy up PhoneStatusBar deeply nested Runnables
  [statusbar] Use the right settings observer