Merge "Do not show 2nd FingerprintErrorDialog" into tm-qpr-dev