Merge "Added string to encourage user to enroll more fingerprints" into tm-qpr-dev