Merge "Remove udfps_enroll_calibration flag" into main