Merge "Track Bitmap native allocations" into main