Merge "Add a cancel string for the dialog to handle Tamil translation"