Merge "Fix detect biometric logic." into udc-dev