Merge "Update strings to match updated figma" into main