Merge "Revert DND toggle back to a button" into sc-dev