Merge "Revert "Revert "Revert "Hold WeakReference to split callback"""" into main