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

Change-Id: I2f6bdb45f12e90ea3a1d6ce01f2bebcd82a8b31e