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