Merge "Make sure BiometricType is never null" into qt-dev