Merge "GraphicsTracker: ensure migrated buffers are overwritten" into main