Merge "Forward correct biometric in AuthenticationClient"