Merge "Fix bug where hotseat disappears" into main