Merge "Delay TransitionAnimator.onAnimationEnd by one frame (1/4)" into main