Merge "Remove unused strings" into tm-qpr-dev