Merge "Fix cast exception when dropping widgets to a drop target" into sc-dev am: 2e17bbae0d

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14281909

Change-Id: Ic486ab77bca7b31848f30dc80034e08add392310

src/com/android/launcher3/ButtonDropTarget.java

@@ -240,6 +240,7 @@ public abstract class ButtonDropTarget extends TextView
 
         final Rect to = getIconRect(d);
         final float scale = (float) to.width() / from.width();
+        d.dragView.detachContentView(/* reattachToPreviousParent= */ true);
         mDropTargetBar.deferOnDragEnd();
 
         Runnable onAnimationEndRunnable = () -> {