Merge "Fix flake in BubbleBarViewAnimatorTest" into main