Merge "Don't remove bubbles after mode switching" into main