Merge "Fix inaccuracy in biometric timeout"