Merge changes If1a00ac6,I5b233070 into tm-qpr-dev

* changes:
  Hide QSB (toast) when editing workspace
  Add flag for moving the workspace edit buttons to bottom