Merge "Revert "Track Bitmap native allocations"" into main