Merge "Support expanding the bar while animating" into main