Merge "Introduce direct listener API for alarm delivery"