Merge "Move face auth timeout error handling into a separate method." into tm-qpr-dev