Merge "Update placement of the hotseat according to the bubble bar location." into main