Merge "Add more udfps legacy support for transitions" into main