Merge "Update DND strings" into pi-dev