Merge "Reset the size of hotseat cells" into tm-dev