Merge "Only request resetLockout if enrollments exist" into sc-dev