Merge "Remove WeakReference for Toast next view" into main