Merge "Revert "Switching to lazily batching alarms by default""