Merge "Use WeaklyReferencedCallback annotation" into main