Merge "Rename OP_USE_FACE to OP_USE_BIOMETRIC"