Merge "Use frozen state callback to drop listener alarms" into main