Merge "Account for lockout when determining if biometrics should be used"