Merge "Move face and fingerprint error handling into separate methods." into tm-qpr-dev