Merge "Update fingerprint enrollment finished string" into tm-qpr-dev