Merge "Add ignoreEnrollmentState to prompt info" into sc-v2-dev