Merge pull request #341 from wcwang/next

[Alarm] Fixed the issue of restoring the previous alarms.