Merge "Support force fingerprint reenrollment" into main