Merge "Biometric time-based resetLockout for multi-biometric devices" into sc-dev