Merge "Make hotseat column span responsive" into main