Merge "Fix allocation tracking race"