Merge "Update channel DND setting" into pi-dev