Merge "Fix: Fingerprint detect should not depend on enrollment match" into main