Merge "Handle alarm firing outside of DND period." into nyc-dev