Merge "Added return before the animation is started." into main