Merge "Only adjust the hotseat if bubble bar is visible." into main