Merge "Revert "Add userId information in Transition#AnimationOptions"" into main