Merge "Fix flake in BubblesTest" into main