Merge "Don't reset DND notification flag"