Merge "Add lockout and mandatory biometric error constant" into main