Merge "Add handle wrapper to allocation listener"