Merge "Switching to lazily batching alarms by default"