Merge "RESTRICT AUTOMERGE Fix detect biometric logic." into tm-qpr-dev