Merge "Add return animation functionality to ActivityTransitionAnimator." into main