Merge "Revert "Disable DND status change notification on watches.""