Merge "Update dnd defaults for new users" into pi-dev