Merge "Fix hotseat width to span a number of columns" into tm-dev