Merge "Fix misplaced surface from fold -> unfold while bubbles are expanded" into udc-dev