diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index 8efad00c5d..056de79b83 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -88,7 +88,7 @@ import android.window.SplashScreen;
 import androidx.annotation.BinderThread;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-//import com.android.app.viewcapture.SettingsAwareViewCapture;
+import com.android.app.viewcapture.SettingsAwareViewCapture;
 import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Launcher;
@@ -532,7 +532,7 @@ public class QuickstepLauncher extends Launcher {
         addMultiWindowModeChangedListener(mDepthController);
         initUnfoldTransitionProgressProvider();
         if (FeatureFlags.CONTINUOUS_VIEW_TREE_CAPTURE.get()) {
-//            mViewCapture = SettingsAwareViewCapture.getInstance(this).startCapture(getWindow());
+            mViewCapture = SettingsAwareViewCapture.getInstance(this).startCapture(getWindow());
         }
         getWindow().addPrivateFlags(PRIVATE_FLAG_OPTIMIZE_MEASURE);
     }
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 0506128b47..0113dd40de 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -69,7 +69,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
 
-//import com.android.app.viewcapture.SettingsAwareViewCapture;
+import com.android.app.viewcapture.SettingsAwareViewCapture;
 import com.android.launcher3.BaseDraggingActivity;
 import com.android.launcher3.LauncherPrefs;
 import com.android.launcher3.R;
@@ -1229,9 +1229,9 @@ public class TouchInteractionService extends Service
             }
             mTaskbarManager.dumpLogs("", pw);
 
-//            if (FeatureFlags.CONTINUOUS_VIEW_TREE_CAPTURE.get()) {
-//                SettingsAwareViewCapture.getInstance(this).dump(pw, fd, this);
-//            }
+            if (FeatureFlags.CONTINUOUS_VIEW_TREE_CAPTURE.get()) {
+                SettingsAwareViewCapture.getInstance(this).dump(pw, fd, this);
+            }
         }
     }
 
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 82139ab154..fafc441561 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -97,7 +97,7 @@ public final class FeatureFlags {
 
         public static final BooleanFlag ENABLE_GESTURE_ERROR_DETECTION = getDebugFlag(270389990,
                         "ENABLE_GESTURE_ERROR_DETECTION",
-                        true,
+                        false,
                         "Analyze gesture events and log detected errors");
 
         // When enabled the promise icon is visible in all apps while installation an
@@ -160,12 +160,12 @@ public final class FeatureFlags {
 
         public static final BooleanFlag ENABLE_BULK_WORKSPACE_ICON_LOADING = getDebugFlag(270392203,
                         "ENABLE_BULK_WORKSPACE_ICON_LOADING",
-                        true,
+                        false,
                         "Enable loading workspace icons in bulk.");
 
         public static final BooleanFlag ENABLE_BULK_ALL_APPS_ICON_LOADING = getDebugFlag(270392465,
                         "ENABLE_BULK_ALL_APPS_ICON_LOADING",
-                        true,
+                        false,
                         "Enable loading all apps icons in bulk.");
 
         public static final BooleanFlag ENABLE_DATABASE_RESTORE = getDebugFlag(270392706,