Merge "Fix a bug where bubbles intercepted swipe gestures from fold->unfold" into main