Merge "Fix generic wrong strings to comply with the UX guideline" into tm-qpr-dev