Merge "ZenModeConfig XML no longer stores alarms twice."