Merge "Updated dnd secondary text in sound settings" into pi-dev