Merge "Reset the bubble bar scale when the animation is interrupted" into main