Merge changes I0ca13626,I3677ce54 into nyc-dev

* changes:
  Fixed a flicker when closing QS without notifications
  Handled expandability and swiping while guts are exposed