Merge "Fix legacy udfps occluded state transitions" into main