Merge "Update the strings to match the Figma mock" into tm-dev