Merge "Fix bubbles being on the wrong side after fold -> unfold" into main