Merge "Ensure udfps icon doesnt disappear in enroll" into main