Merge "Adding product string variants on choose lock page" into tm-qpr-dev