Merge "Ensure DisplayTracker callback is not GC" into main