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