Merge "Update dnd defaults for new users" into pi-dev am: 8aec7be10e
am: e799bda2e0

Change-Id: Ia9dff7647091ebdd62738030b888d0d805b043b3