Merge "Use the correct text for DND onboarding." into pi-dev