Merge "Schedule next alarm instance when alarm is pre-dismissed" into ub-deskclock-escargatoire