Merge changes from topic "revert-17983445-hotseat_span-WQWWPUHOTD" into tm-dev

* changes:
  Revert "Fix hotseat width to span a number of columns"
  Revert "Update workspace, cell layout, shortcut and widget, and cell size calculations."