Merge "Fix BiometricProvider test" into main