Merge "Don't exit dnd rule for old alarms" into pi-dev