Merge "Using new Biometric API"