Merge "Generate challenge and reset lockout only if user has enrolled biometrics" into qt-dev