Merge "Fix state after dragging bubble to dismiss" into main