Merge "Fix height of hotseat" into tm-dev