Merge "Fix potential race issue with removing bubble" into main