Merge "Differentiate dnd countdowns/countdowns to an alarm" into oc-mr1-dev