Merge "Update dnd settings summary" into pi-dev