Merge changes I875b962b,I99c4c290

* changes:
  Add API for System QS tiles to set status icons
  Cleanup the status bar flow.