Merge "Fix bugs regarding delay the dispatching of non-wakeup alarms"