Merge "Don't snooze other modes when user deactivates DND" into main