Merge "Clean up onAnimationEnd handling"