diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 1988c2d81f..285f2c1df8 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -36,4 +36,5 @@ public final class FeatureFlags {
     public static boolean LAUNCHER3_ICON_NORMALIZATION = true;
     public static boolean LAUNCHER3_CLIPPED_FOLDER_ICON = false;
     public static boolean LAUNCHER3_LEGACY_LOGGING = false;
+    public static boolean LAUNCHER3_USE_SYSTEM_DRAG_DRIVER = false;
 }
diff --git a/src/com/android/launcher3/dragndrop/DragDriver.java b/src/com/android/launcher3/dragndrop/DragDriver.java
index 6e4b430d4a..7ad45f9051 100644
--- a/src/com/android/launcher3/dragndrop/DragDriver.java
+++ b/src/com/android/launcher3/dragndrop/DragDriver.java
@@ -20,6 +20,7 @@ import com.android.launcher3.AnotherWindowDropTarget;
 import com.android.launcher3.DropTarget;
 import com.android.launcher3.ItemInfo;
 import com.android.launcher3.Utilities;
+import com.android.launcher3.config.FeatureFlags;
 
 import android.content.ClipData;
 import android.content.Intent;
@@ -90,7 +91,7 @@ public abstract class DragDriver {
 
     public static DragDriver create(
             DragController dragController, ItemInfo dragInfo, DragView dragView) {
-        if (Utilities.isNycOrAbove()) {
+        if (FeatureFlags.LAUNCHER3_USE_SYSTEM_DRAG_DRIVER && Utilities.isNycOrAbove()) {
             return new SystemDragDriver(dragController, dragInfo.getIntent(), dragView);
         } else {
             return new InternalDragDriver(dragController);