Merge "Add WeaklyReferencedCallback to DisplayTracker" into main