Merge "RESTRICT AUTOMERGE Update UDFPS enroll progress when help received" into sc-dev