Merge "Combine UDFPS enroll segments into a single circle" into sc-v2-dev