Merge "Revert "Fix squished hotseat due to bubbles"" into main