Merge "Remove timeout from IFingerprint generateChallenge" into sc-dev