Merge "Deflake BubbleViewScreenshotTest" into main