Merge "No alarm warning in dnd dialog if alarms allowed"