Merge "Null safe BubbleBarAnimationHelper" into main