Merge "Adjust the hotseat when the bubble bar becomes visible" into main