Merge "Update strings for new settings design" into main