Merge "Do not dismiss BiometricPrompt when "soft" errors are received" into qt-dev