Merge "Fix biometric tests that relied on a non-zero error reset delay." into sc-dev