Merge "[DO NOT MERGE] Fix tablet verify pin wording" into tm-qpr-dev