Merge "Tune delivery and batching of alarms" into lmp-dev