diff --git a/quickstep/src/com/android/quickstep/TaskViewUtils.java b/quickstep/src/com/android/quickstep/TaskViewUtils.java
index 289801c1a0..b8c9f1e9d6 100644
--- a/quickstep/src/com/android/quickstep/TaskViewUtils.java
+++ b/quickstep/src/com/android/quickstep/TaskViewUtils.java
@@ -494,11 +494,13 @@ public final class TaskViewUtils {
                 }
             }
             if (taskId == initialTaskId) {
-                splitRoot1 = change.getParent() == null ? change : transitionInfo.getChange(change.getParent());
+                splitRoot1 = change.getParent() == null ? change :
+                        transitionInfo.getChange(change.getParent());
                 openingTargets.add(splitRoot1.getLeash());
             }
             if (taskId == secondTaskId) {
-                splitRoot2 = change.getParent() == null ? change : transitionInfo.getChange(change.getParent());
+                splitRoot2 = change.getParent() == null ? change :
+                        transitionInfo.getChange(change.getParent());
                 openingTargets.add(splitRoot2.getLeash());
             }
         }
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 8993636c1a..09db6d1547 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -46,342 +46,342 @@ import app.lawnchair.preferences2.PreferenceManager2;
  * <p>All the flags should be defined here with appropriate default values.
  */
 public final class FeatureFlags {
-        @VisibleForTesting
-        public static Predicate<BooleanFlag> sBooleanReader = f -> f.mCurrentValue;
-        @VisibleForTesting
-        public static ToIntFunction<IntFlag> sIntReader = f -> f.mCurrentValue;
-        private FeatureFlags() { }
-        public static boolean showFlagTogglerUi(Context context) {
-                return Utilities.isDevelopersOptionsEnabled(context);
-        }
-        /**
-         * True when the build has come from Android Studio and is being used for local debugging.
-         * @deprecated Use {@link BuildConfig#IS_STUDIO_BUILD} directly
-         */
-        @Deprecated
-        public static final boolean IS_STUDIO_BUILD = false;
-        /**
-         * Enable moving the QSB on the 0th screen of the workspace. This is not a configuration feature
-         * and should be modified at a project level.
-         * @deprecated Use {@link BuildConfig#QSB_ON_FIRST_SCREEN} directly
-         */
-        @Deprecated
-        public static boolean topQsbOnFirstScreenEnabled(Context context) {
-                PreferenceManager2 preferenceManager2 = PreferenceManager2.getInstance(context);
-                return PreferenceExtensionsKt.firstBlocking(preferenceManager2.getEnableSmartspace());
-        }
-        public static boolean showDotPagination(Context context) {
-                PreferenceManager2 preferenceManager2 = PreferenceManager2.getInstance(context);
-                return PreferenceExtensionsKt.firstBlocking(preferenceManager2.getEnableDotPagination());
-        }
-        public static boolean showMaterialUPopup(Context context) {
-                PreferenceManager2 preferenceManager2 = PreferenceManager2.getInstance(context);
-                return PreferenceExtensionsKt.firstBlocking(preferenceManager2.getEnableMaterialUPopUp());
-        }
-        /**
-         * Feature flag to handle define config changes dynamically instead of killing the process.
-         * <p>
-         *
-         * To add a new flag that can be toggled through the flags UI:
-         * <p>
-         * Declare a new ToggleableFlag below. Give it a unique key (e.g. "QSB_ON_FIRST_SCREEN"),
-         * and set a default value for the flag. This will be the default value on Debug builds.
-         * <p>
-         */
-        // TODO(Block 1): Clean up flags
-        public static final BooleanFlag ENABLE_SEARCH_RESULT_BACKGROUND_DRAWABLES = getReleaseFlag(
-                270394041, "ENABLE_SEARCH_RESULT_BACKGROUND_DRAWABLES", ENABLED,
-                "Enable option to replace decorator-based search result backgrounds with drawables");
-        public static final BooleanFlag ENABLE_SEARCH_RESULT_LAUNCH_TRANSITION = getReleaseFlag(
-                270394392, "ENABLE_SEARCH_RESULT_LAUNCH_TRANSITION", ENABLED,
-                "Enable option to launch search results using the new view container transitions");
-        // TODO(Block 2): Clean up flags
-        public static final BooleanFlag ENABLE_MULTI_DISPLAY_PARTIAL_DEPTH = getDebugFlag(270395073,
-                "ENABLE_MULTI_DISPLAY_PARTIAL_DEPTH", DISABLED,
-                "Allow bottom sheet depth to be smaller than 1 for multi-display devices.");
-        // TODO(Block 3): Clean up flags
-        public static final BooleanFlag ENABLE_DISMISS_PREDICTION_UNDO = getDebugFlag(270394476,
-                "ENABLE_DISMISS_PREDICTION_UNDO", DISABLED,
-                "Show an 'Undo' snackbar when users dismiss a predicted hotseat item");
-        public static final BooleanFlag CONTINUOUS_VIEW_TREE_CAPTURE = getDebugFlag(270395171,
-                "CONTINUOUS_VIEW_TREE_CAPTURE", DISABLED, "Capture View tree every frame");
-        public static final BooleanFlag ENABLE_WORKSPACE_LOADING_OPTIMIZATION = getDebugFlag(251502424,
-                "ENABLE_WORKSPACE_LOADING_OPTIMIZATION", DISABLED,
-                "load the current workspace screen visible to the user before the rest rather than "
-                        + "loading all of them at once.");
-        public static final BooleanFlag CHANGE_MODEL_DELEGATE_LOADING_ORDER = getDebugFlag(251502424,
-                "CHANGE_MODEL_DELEGATE_LOADING_ORDER", DISABLED,
-                "changes the timing of the loading and binding of delegate items during "
-                        + "data preparation for loading the home screen");
-        // TODO(Block 4): Cleanup flags
-        public static final BooleanFlag ENABLE_FLOATING_SEARCH_BAR =
-                getReleaseFlag(268388460, "ENABLE_FLOATING_SEARCH_BAR", DISABLED,
-                        "Allow search bar to persist and animate across states, and attach to"
-                                + " the keyboard from the bottom of the screen");
-        public static final BooleanFlag ENABLE_ALL_APPS_FROM_OVERVIEW =
-                getDebugFlag(275132633, "ENABLE_ALL_APPS_FROM_OVERVIEW", DISABLED,
-                        "Allow entering All Apps from Overview (e.g. long swipe up from app)");
-        public static final BooleanFlag ENABLE_SHOW_KEYBOARD_OPTION_IN_ALL_APPS = getReleaseFlag(
-                270394468, "ENABLE_SHOW_KEYBOARD_OPTION_IN_ALL_APPS", ENABLED,
-                "Enable option to show keyboard when going to all-apps");
-        // TODO(Block 5): Clean up flags
-        public static final BooleanFlag ENABLE_TWOLINE_DEVICESEARCH = getDebugFlag(201388851,
-                "ENABLE_TWOLINE_DEVICESEARCH", ENABLED,
-                "Enable two line label for icons with labels on device search.");
-        public static final BooleanFlag ENABLE_ICON_IN_TEXT_HEADER = getDebugFlag(270395143,
-                "ENABLE_ICON_IN_TEXT_HEADER", DISABLED, "Show icon in textheader");
-        public static final BooleanFlag ENABLE_PREMIUM_HAPTICS_ALL_APPS = getDebugFlag(270396358,
-                "ENABLE_PREMIUM_HAPTICS_ALL_APPS", DISABLED,
-                "Enables haptics opening/closing All apps");
-        // TODO(Block 6): Clean up flags
-        public static final BooleanFlag ENABLE_ALL_APPS_SEARCH_IN_TASKBAR = getDebugFlag(270393900,
-                "ENABLE_ALL_APPS_SEARCH_IN_TASKBAR", DISABLED,
-                "Enables Search box in Taskbar All Apps.");
-        public static final BooleanFlag SECONDARY_DRAG_N_DROP_TO_PIN = getDebugFlag(270395140,
-                "SECONDARY_DRAG_N_DROP_TO_PIN", DISABLED,
-                "Enable dragging and dropping to pin apps within secondary display");
-        // TODO(Block 7): Clean up flags
-        public static final BooleanFlag ENABLE_FORCED_MONO_ICON = getDebugFlag(270396209,
-                "ENABLE_FORCED_MONO_ICON", DISABLED,
-                "Enable the ability to generate monochromatic icons, if it is not provided by the app");
-        // TODO(Block 8): Clean up flags
-        public static final BooleanFlag ENABLE_MATERIAL_U_POPUP = getDebugFlag(270395516,
-                "ENABLE_MATERIAL_U_POPUP", ENABLED, "Switch popup UX to use material U");
-        // TODO(Block 9): Clean up flags
-        public static final BooleanFlag ENABLE_DOWNLOAD_APP_UX_V2 = getReleaseFlag(270395134,
-                "ENABLE_DOWNLOAD_APP_UX_V2", ENABLED, "Updates the download app UX"
-                        + " to have better visuals");
-        public static final BooleanFlag ENABLE_DOWNLOAD_APP_UX_V3 = getDebugFlag(270395186,
-                "ENABLE_DOWNLOAD_APP_UX_V3", ENABLED, "Updates the download app UX"
-                        + " to have better visuals, improve contrast, and color");
-        public static final BooleanFlag SHOW_DOT_PAGINATION = getDebugFlag(270395278,
-                "SHOW_DOT_PAGINATION", ENABLED, "Enable showing dot pagination in workspace");
-        public static final BooleanFlag LARGE_SCREEN_WIDGET_PICKER = getDebugFlag(270395809,
-                "LARGE_SCREEN_WIDGET_PICKER", ENABLED, "Enable new widget picker that takes "
-                        + "advantage of large screen format");
-        public static final BooleanFlag MULTI_SELECT_EDIT_MODE = getDebugFlag(270709220,
-                "MULTI_SELECT_EDIT_MODE", DISABLED, "Enable new multi-select edit mode "
-                        + "for home screen");
-        // TODO(Block 10): Clean up flags
-        public static final BooleanFlag ENABLE_BACK_SWIPE_LAUNCHER_ANIMATION = getDebugFlag(270614790,
-                "ENABLE_BACK_SWIPE_LAUNCHER_ANIMATION", DISABLED,
-                "Enables predictive back animation from all apps and widgets to home");
-        // TODO(Block 11): Clean up flags
-        public static final BooleanFlag FOLDABLE_SINGLE_PAGE = getDebugFlag(270395274,
-                "FOLDABLE_SINGLE_PAGE", DISABLED, "Use a single page for the workspace");
-        public static final BooleanFlag ENABLE_PARAMETRIZE_REORDER = getDebugFlag(289420844,
-                "ENABLE_PARAMETRIZE_REORDER", DISABLED,
-                "Enables generating the reorder using a set of parameters");
-        // TODO(Block 12): Clean up flags
-        public static final BooleanFlag ENABLE_MULTI_INSTANCE = getDebugFlag(270396680,
-                "ENABLE_MULTI_INSTANCE", DISABLED,
-                "Enables creation and filtering of multiple task instances in overview");
-        // TODO(Block 13): Clean up flags
-        public static final BooleanFlag ENABLE_DEVICE_SEARCH_PERFORMANCE_LOGGING = getReleaseFlag(
-                270391397, "ENABLE_DEVICE_SEARCH_PERFORMANCE_LOGGING", DISABLED,
-                "Allows on device search in all apps logging");
-        // TODO(Block 14): Cleanup flags
-        public static final BooleanFlag NOTIFY_CRASHES = getDebugFlag(270393108, "NOTIFY_CRASHES",
-                TEAMFOOD, "Sends a notification whenever launcher encounters an uncaught exception.");
-        public static final BooleanFlag ENABLE_TRANSIENT_TASKBAR = getDebugFlag(270395798,
-                "ENABLE_TRANSIENT_TASKBAR", ENABLED, "Enables transient taskbar.");
-        // TODO(Block 16): Clean up flags
-        // When enabled the promise icon is visible in all apps while installation an app.
-        public static final BooleanFlag PROMISE_APPS_IN_ALL_APPS = getDebugFlag(270390012,
-                "PROMISE_APPS_IN_ALL_APPS", DISABLED, "Add promise icon in all-apps");
-        public static final BooleanFlag KEYGUARD_ANIMATION = getDebugFlag(270390904,
-                "KEYGUARD_ANIMATION", DISABLED,
-                "Enable animation for keyguard going away on wallpaper");
-        public static final BooleanFlag ENABLE_DEVICE_SEARCH = getReleaseFlag(270390907,
-                "ENABLE_DEVICE_SEARCH", ENABLED, "Allows on device search in all apps");
-        public static final BooleanFlag ENABLE_HIDE_HEADER = getReleaseFlag(270390930,
-                "ENABLE_HIDE_HEADER", ENABLED, "Hide header on keyboard before typing in all apps");
-        public static final BooleanFlag ENABLE_EXPANDING_PAUSE_WORK_BUTTON = getDebugFlag(270390779,
-                "ENABLE_EXPANDING_PAUSE_WORK_BUTTON", DISABLED,
-                "Expand and collapse pause work button while scrolling");
-        public static final BooleanFlag COLLECT_SEARCH_HISTORY = getReleaseFlag(270391455,
-                "COLLECT_SEARCH_HISTORY", DISABLED, "Allow launcher to collect search history for log");
-        public static final BooleanFlag ENABLE_TWOLINE_ALLAPPS = getDebugFlag(270390937,
-                "ENABLE_TWOLINE_ALLAPPS", DISABLED, "Enables two line label inside all apps.");
-        public static final BooleanFlag IME_STICKY_SNACKBAR_EDU = getDebugFlag(270391693,
-                "IME_STICKY_SNACKBAR_EDU", ENABLED, "Show sticky IME edu in AllApps");
-        public static final BooleanFlag ENABLE_PEOPLE_TILE_PREVIEW = getDebugFlag(270391653,
-                "ENABLE_PEOPLE_TILE_PREVIEW", DISABLED,
-                "Experimental: Shows conversation shortcuts on home screen as search results");
-        public static final BooleanFlag FOLDER_NAME_MAJORITY_RANKING = getDebugFlag(270391638,
-                "FOLDER_NAME_MAJORITY_RANKING", ENABLED,
-                "Suggests folder names based on majority based ranking.");
-        public static final BooleanFlag INJECT_FALLBACK_APP_CORPUS_RESULTS = getReleaseFlag(270391706,
-                "INJECT_FALLBACK_APP_CORPUS_RESULTS", DISABLED,
-                "Inject fallback app corpus result when AiAi fails to return it.");
-        public static final BooleanFlag ENABLE_LONG_PRESS_NAV_HANDLE =
-                getReleaseFlag(282993230, "ENABLE_LONG_PRESS_NAV_HANDLE_MPR", TEAMFOOD,
-                        "Enables long pressing on the bottom bar nav handle to trigger events.");
-        // TODO(Block 17): Clean up flags
-        public static final BooleanFlag ENABLE_TASKBAR_PINNING = getDebugFlag(270396583,
-                "ENABLE_TASKBAR_PINNING", DISABLED,
-                "Enables taskbar pinning to allow user to switch between transient and persistent "
-                        + "taskbar flavors");
-        // TODO(Block 18): Clean up flags
-        public static final BooleanFlag ENABLE_APP_PAIRS = getDebugFlag(274189428,
-                "ENABLE_APP_PAIRS", DISABLED,
-                "Enables the ability to create and save app pairs on the Home screen for easy"
-                        + " split screen launching.");
-        // TODO(Block 19): Clean up flags
-        public static final BooleanFlag SCROLL_TOP_TO_RESET = getReleaseFlag(270395177,
-                "SCROLL_TOP_TO_RESET", ENABLED,
-                "Bring up IME and focus on input when scroll to top if 'Always show keyboard'"
-                        + " is enabled or in prefix state");
-        public static final BooleanFlag ENABLE_SEARCH_UNINSTALLED_APPS = getReleaseFlag(270395269,
-                "ENABLE_SEARCH_UNINSTALLED_APPS", ENABLED, "Search uninstalled app results.");
-        // TODO(Block 20): Clean up flags
-        public static final BooleanFlag ENABLE_SCRIM_FOR_APP_LAUNCH = getDebugFlag(270393276,
-                "ENABLE_SCRIM_FOR_APP_LAUNCH", DISABLED, "Enables scrim during app launch animation.");
-        public static final BooleanFlag ENABLE_BACK_SWIPE_HOME_ANIMATION = getDebugFlag(270393426,
-                "ENABLE_BACK_SWIPE_HOME_ANIMATION", ENABLED,
-                "Enables home animation to icon when user swipes back.");
-        public static final BooleanFlag ENABLE_DYNAMIC_TASKBAR_THRESHOLDS = getDebugFlag(294252473,
-                "ENABLE_DYNAMIC_TASKBAR_THRESHOLDS", ENABLED,
-                "Enables taskbar thresholds that scale based on screen size.");
-        // TODO(Block 21): Clean up flags
-        public static final BooleanFlag ENABLE_APP_ICON_FOR_INLINE_SHORTCUTS = getDebugFlag(270395087,
-                "ENABLE_APP_ICON_IN_INLINE_SHORTCUTS", DISABLED, "Show app icon for inline shortcut");
-        // TODO(Block 22): Clean up flags
-        public static final BooleanFlag ENABLE_WIDGET_TRANSITION_FOR_RESIZING = getDebugFlag(268553314,
-                "ENABLE_WIDGET_TRANSITION_FOR_RESIZING", DISABLED,
-                "Enable widget transition animation when resizing the widgets");
-        public static final BooleanFlag PREEMPTIVE_UNFOLD_ANIMATION_START = getDebugFlag(270397209,
-                "PREEMPTIVE_UNFOLD_ANIMATION_START", ENABLED,
-                "Enables starting the unfold animation preemptively when unfolding, without"
-                        + "waiting for SystemUI and then merging the SystemUI progress whenever we "
-                        + "start receiving the events");
-        // TODO(Block 23): Clean up flags
-        public static final BooleanFlag ENABLE_GRID_ONLY_OVERVIEW = getDebugFlag(270397206,
-                "ENABLE_GRID_ONLY_OVERVIEW", TEAMFOOD,
-                "Enable a grid-only overview without a focused task.");
+    @VisibleForTesting
+    public static Predicate<BooleanFlag> sBooleanReader = f -> f.mCurrentValue;
+    @VisibleForTesting
+    public static ToIntFunction<IntFlag> sIntReader = f -> f.mCurrentValue;
+    private FeatureFlags() { }
+    public static boolean showFlagTogglerUi(Context context) {
+            return Utilities.isDevelopersOptionsEnabled(context);
+    }
+    /**
+     * True when the build has come from Android Studio and is being used for local debugging.
+     * @deprecated Use {@link BuildConfig#IS_STUDIO_BUILD} directly
+     */
+    @Deprecated
+    public static final boolean IS_STUDIO_BUILD = false;
+    /**
+     * Enable moving the QSB on the 0th screen of the workspace. This is not a configuration feature
+     * and should be modified at a project level.
+     * @deprecated Use {@link BuildConfig#QSB_ON_FIRST_SCREEN} directly
+     */
+    @Deprecated
+    public static boolean topQsbOnFirstScreenEnabled(Context context) {
+            PreferenceManager2 preferenceManager2 = PreferenceManager2.getInstance(context);
+            return PreferenceExtensionsKt.firstBlocking(preferenceManager2.getEnableSmartspace());
+    }
+    public static boolean showDotPagination(Context context) {
+            PreferenceManager2 preferenceManager2 = PreferenceManager2.getInstance(context);
+            return PreferenceExtensionsKt.firstBlocking(preferenceManager2.getEnableDotPagination());
+    }
+    public static boolean showMaterialUPopup(Context context) {
+            PreferenceManager2 preferenceManager2 = PreferenceManager2.getInstance(context);
+            return PreferenceExtensionsKt.firstBlocking(preferenceManager2.getEnableMaterialUPopUp());
+    }
+    /**
+     * Feature flag to handle define config changes dynamically instead of killing the process.
+     * <p>
+     *
+     * To add a new flag that can be toggled through the flags UI:
+     * <p>
+     * Declare a new ToggleableFlag below. Give it a unique key (e.g. "QSB_ON_FIRST_SCREEN"),
+     * and set a default value for the flag. This will be the default value on Debug builds.
+     * <p>
+     */
+    // TODO(Block 1): Clean up flags
+    public static final BooleanFlag ENABLE_SEARCH_RESULT_BACKGROUND_DRAWABLES = getReleaseFlag(
+            270394041, "ENABLE_SEARCH_RESULT_BACKGROUND_DRAWABLES", ENABLED,
+            "Enable option to replace decorator-based search result backgrounds with drawables");
+    public static final BooleanFlag ENABLE_SEARCH_RESULT_LAUNCH_TRANSITION = getReleaseFlag(
+            270394392, "ENABLE_SEARCH_RESULT_LAUNCH_TRANSITION", ENABLED,
+            "Enable option to launch search results using the new view container transitions");
+    // TODO(Block 2): Clean up flags
+    public static final BooleanFlag ENABLE_MULTI_DISPLAY_PARTIAL_DEPTH = getDebugFlag(270395073,
+            "ENABLE_MULTI_DISPLAY_PARTIAL_DEPTH", DISABLED,
+            "Allow bottom sheet depth to be smaller than 1 for multi-display devices.");
+    // TODO(Block 3): Clean up flags
+    public static final BooleanFlag ENABLE_DISMISS_PREDICTION_UNDO = getDebugFlag(270394476,
+            "ENABLE_DISMISS_PREDICTION_UNDO", DISABLED,
+            "Show an 'Undo' snackbar when users dismiss a predicted hotseat item");
+    public static final BooleanFlag CONTINUOUS_VIEW_TREE_CAPTURE = getDebugFlag(270395171,
+            "CONTINUOUS_VIEW_TREE_CAPTURE", DISABLED, "Capture View tree every frame");
+    public static final BooleanFlag ENABLE_WORKSPACE_LOADING_OPTIMIZATION = getDebugFlag(251502424,
+            "ENABLE_WORKSPACE_LOADING_OPTIMIZATION", DISABLED,
+            "load the current workspace screen visible to the user before the rest rather than "
+                    + "loading all of them at once.");
+    public static final BooleanFlag CHANGE_MODEL_DELEGATE_LOADING_ORDER = getDebugFlag(251502424,
+            "CHANGE_MODEL_DELEGATE_LOADING_ORDER", DISABLED,
+            "changes the timing of the loading and binding of delegate items during "
+                    + "data preparation for loading the home screen");
+    // TODO(Block 4): Cleanup flags
+    public static final BooleanFlag ENABLE_FLOATING_SEARCH_BAR =
+            getReleaseFlag(268388460, "ENABLE_FLOATING_SEARCH_BAR", DISABLED,
+                    "Allow search bar to persist and animate across states, and attach to"
+                            + " the keyboard from the bottom of the screen");
+    public static final BooleanFlag ENABLE_ALL_APPS_FROM_OVERVIEW =
+            getDebugFlag(275132633, "ENABLE_ALL_APPS_FROM_OVERVIEW", DISABLED,
+                    "Allow entering All Apps from Overview (e.g. long swipe up from app)");
+    public static final BooleanFlag ENABLE_SHOW_KEYBOARD_OPTION_IN_ALL_APPS = getReleaseFlag(
+            270394468, "ENABLE_SHOW_KEYBOARD_OPTION_IN_ALL_APPS", ENABLED,
+            "Enable option to show keyboard when going to all-apps");
+    // TODO(Block 5): Clean up flags
+    public static final BooleanFlag ENABLE_TWOLINE_DEVICESEARCH = getDebugFlag(201388851,
+            "ENABLE_TWOLINE_DEVICESEARCH", ENABLED,
+            "Enable two line label for icons with labels on device search.");
+    public static final BooleanFlag ENABLE_ICON_IN_TEXT_HEADER = getDebugFlag(270395143,
+            "ENABLE_ICON_IN_TEXT_HEADER", DISABLED, "Show icon in textheader");
+    public static final BooleanFlag ENABLE_PREMIUM_HAPTICS_ALL_APPS = getDebugFlag(270396358,
+            "ENABLE_PREMIUM_HAPTICS_ALL_APPS", DISABLED,
+            "Enables haptics opening/closing All apps");
+    // TODO(Block 6): Clean up flags
+    public static final BooleanFlag ENABLE_ALL_APPS_SEARCH_IN_TASKBAR = getDebugFlag(270393900,
+            "ENABLE_ALL_APPS_SEARCH_IN_TASKBAR", DISABLED,
+            "Enables Search box in Taskbar All Apps.");
+    public static final BooleanFlag SECONDARY_DRAG_N_DROP_TO_PIN = getDebugFlag(270395140,
+            "SECONDARY_DRAG_N_DROP_TO_PIN", DISABLED,
+            "Enable dragging and dropping to pin apps within secondary display");
+    // TODO(Block 7): Clean up flags
+    public static final BooleanFlag ENABLE_FORCED_MONO_ICON = getDebugFlag(270396209,
+            "ENABLE_FORCED_MONO_ICON", DISABLED,
+            "Enable the ability to generate monochromatic icons, if it is not provided by the app");
+    // TODO(Block 8): Clean up flags
+    public static final BooleanFlag ENABLE_MATERIAL_U_POPUP = getDebugFlag(270395516,
+            "ENABLE_MATERIAL_U_POPUP", ENABLED, "Switch popup UX to use material U");
+    // TODO(Block 9): Clean up flags
+    public static final BooleanFlag ENABLE_DOWNLOAD_APP_UX_V2 = getReleaseFlag(270395134,
+            "ENABLE_DOWNLOAD_APP_UX_V2", ENABLED, "Updates the download app UX"
+                    + " to have better visuals");
+    public static final BooleanFlag ENABLE_DOWNLOAD_APP_UX_V3 = getDebugFlag(270395186,
+            "ENABLE_DOWNLOAD_APP_UX_V3", ENABLED, "Updates the download app UX"
+                    + " to have better visuals, improve contrast, and color");
+    public static final BooleanFlag SHOW_DOT_PAGINATION = getDebugFlag(270395278,
+            "SHOW_DOT_PAGINATION", ENABLED, "Enable showing dot pagination in workspace");
+    public static final BooleanFlag LARGE_SCREEN_WIDGET_PICKER = getDebugFlag(270395809,
+            "LARGE_SCREEN_WIDGET_PICKER", ENABLED, "Enable new widget picker that takes "
+                    + "advantage of large screen format");
+    public static final BooleanFlag MULTI_SELECT_EDIT_MODE = getDebugFlag(270709220,
+            "MULTI_SELECT_EDIT_MODE", DISABLED, "Enable new multi-select edit mode "
+                    + "for home screen");
+    // TODO(Block 10): Clean up flags
+    public static final BooleanFlag ENABLE_BACK_SWIPE_LAUNCHER_ANIMATION = getDebugFlag(270614790,
+            "ENABLE_BACK_SWIPE_LAUNCHER_ANIMATION", DISABLED,
+            "Enables predictive back animation from all apps and widgets to home");
+    // TODO(Block 11): Clean up flags
+    public static final BooleanFlag FOLDABLE_SINGLE_PAGE = getDebugFlag(270395274,
+            "FOLDABLE_SINGLE_PAGE", DISABLED, "Use a single page for the workspace");
+    public static final BooleanFlag ENABLE_PARAMETRIZE_REORDER = getDebugFlag(289420844,
+            "ENABLE_PARAMETRIZE_REORDER", DISABLED,
+            "Enables generating the reorder using a set of parameters");
+    // TODO(Block 12): Clean up flags
+    public static final BooleanFlag ENABLE_MULTI_INSTANCE = getDebugFlag(270396680,
+            "ENABLE_MULTI_INSTANCE", DISABLED,
+            "Enables creation and filtering of multiple task instances in overview");
+    // TODO(Block 13): Clean up flags
+    public static final BooleanFlag ENABLE_DEVICE_SEARCH_PERFORMANCE_LOGGING = getReleaseFlag(
+            270391397, "ENABLE_DEVICE_SEARCH_PERFORMANCE_LOGGING", DISABLED,
+            "Allows on device search in all apps logging");
+    // TODO(Block 14): Cleanup flags
+    public static final BooleanFlag NOTIFY_CRASHES = getDebugFlag(270393108, "NOTIFY_CRASHES",
+            TEAMFOOD, "Sends a notification whenever launcher encounters an uncaught exception.");
+    public static final BooleanFlag ENABLE_TRANSIENT_TASKBAR = getDebugFlag(270395798,
+            "ENABLE_TRANSIENT_TASKBAR", ENABLED, "Enables transient taskbar.");
+    // TODO(Block 16): Clean up flags
+    // When enabled the promise icon is visible in all apps while installation an app.
+    public static final BooleanFlag PROMISE_APPS_IN_ALL_APPS = getDebugFlag(270390012,
+            "PROMISE_APPS_IN_ALL_APPS", DISABLED, "Add promise icon in all-apps");
+    public static final BooleanFlag KEYGUARD_ANIMATION = getDebugFlag(270390904,
+            "KEYGUARD_ANIMATION", DISABLED,
+            "Enable animation for keyguard going away on wallpaper");
+    public static final BooleanFlag ENABLE_DEVICE_SEARCH = getReleaseFlag(270390907,
+            "ENABLE_DEVICE_SEARCH", ENABLED, "Allows on device search in all apps");
+    public static final BooleanFlag ENABLE_HIDE_HEADER = getReleaseFlag(270390930,
+            "ENABLE_HIDE_HEADER", ENABLED, "Hide header on keyboard before typing in all apps");
+    public static final BooleanFlag ENABLE_EXPANDING_PAUSE_WORK_BUTTON = getDebugFlag(270390779,
+            "ENABLE_EXPANDING_PAUSE_WORK_BUTTON", DISABLED,
+            "Expand and collapse pause work button while scrolling");
+    public static final BooleanFlag COLLECT_SEARCH_HISTORY = getReleaseFlag(270391455,
+            "COLLECT_SEARCH_HISTORY", DISABLED, "Allow launcher to collect search history for log");
+    public static final BooleanFlag ENABLE_TWOLINE_ALLAPPS = getDebugFlag(270390937,
+            "ENABLE_TWOLINE_ALLAPPS", DISABLED, "Enables two line label inside all apps.");
+    public static final BooleanFlag IME_STICKY_SNACKBAR_EDU = getDebugFlag(270391693,
+            "IME_STICKY_SNACKBAR_EDU", ENABLED, "Show sticky IME edu in AllApps");
+    public static final BooleanFlag ENABLE_PEOPLE_TILE_PREVIEW = getDebugFlag(270391653,
+            "ENABLE_PEOPLE_TILE_PREVIEW", DISABLED,
+            "Experimental: Shows conversation shortcuts on home screen as search results");
+    public static final BooleanFlag FOLDER_NAME_MAJORITY_RANKING = getDebugFlag(270391638,
+            "FOLDER_NAME_MAJORITY_RANKING", ENABLED,
+            "Suggests folder names based on majority based ranking.");
+    public static final BooleanFlag INJECT_FALLBACK_APP_CORPUS_RESULTS = getReleaseFlag(270391706,
+            "INJECT_FALLBACK_APP_CORPUS_RESULTS", DISABLED,
+            "Inject fallback app corpus result when AiAi fails to return it.");
+    public static final BooleanFlag ENABLE_LONG_PRESS_NAV_HANDLE =
+            getReleaseFlag(282993230, "ENABLE_LONG_PRESS_NAV_HANDLE_MPR", TEAMFOOD,
+                    "Enables long pressing on the bottom bar nav handle to trigger events.");
+    // TODO(Block 17): Clean up flags
+    public static final BooleanFlag ENABLE_TASKBAR_PINNING = getDebugFlag(270396583,
+            "ENABLE_TASKBAR_PINNING", DISABLED,
+            "Enables taskbar pinning to allow user to switch between transient and persistent "
+                    + "taskbar flavors");
+    // TODO(Block 18): Clean up flags
+    public static final BooleanFlag ENABLE_APP_PAIRS = getDebugFlag(274189428,
+            "ENABLE_APP_PAIRS", DISABLED,
+            "Enables the ability to create and save app pairs on the Home screen for easy"
+                    + " split screen launching.");
+    // TODO(Block 19): Clean up flags
+    public static final BooleanFlag SCROLL_TOP_TO_RESET = getReleaseFlag(270395177,
+            "SCROLL_TOP_TO_RESET", ENABLED,
+            "Bring up IME and focus on input when scroll to top if 'Always show keyboard'"
+                    + " is enabled or in prefix state");
+    public static final BooleanFlag ENABLE_SEARCH_UNINSTALLED_APPS = getReleaseFlag(270395269,
+            "ENABLE_SEARCH_UNINSTALLED_APPS", ENABLED, "Search uninstalled app results.");
+    // TODO(Block 20): Clean up flags
+    public static final BooleanFlag ENABLE_SCRIM_FOR_APP_LAUNCH = getDebugFlag(270393276,
+            "ENABLE_SCRIM_FOR_APP_LAUNCH", DISABLED, "Enables scrim during app launch animation.");
+    public static final BooleanFlag ENABLE_BACK_SWIPE_HOME_ANIMATION = getDebugFlag(270393426,
+            "ENABLE_BACK_SWIPE_HOME_ANIMATION", ENABLED,
+            "Enables home animation to icon when user swipes back.");
+    public static final BooleanFlag ENABLE_DYNAMIC_TASKBAR_THRESHOLDS = getDebugFlag(294252473,
+            "ENABLE_DYNAMIC_TASKBAR_THRESHOLDS", ENABLED,
+            "Enables taskbar thresholds that scale based on screen size.");
+    // TODO(Block 21): Clean up flags
+    public static final BooleanFlag ENABLE_APP_ICON_FOR_INLINE_SHORTCUTS = getDebugFlag(270395087,
+            "ENABLE_APP_ICON_IN_INLINE_SHORTCUTS", DISABLED, "Show app icon for inline shortcut");
+    // TODO(Block 22): Clean up flags
+    public static final BooleanFlag ENABLE_WIDGET_TRANSITION_FOR_RESIZING = getDebugFlag(268553314,
+            "ENABLE_WIDGET_TRANSITION_FOR_RESIZING", DISABLED,
+            "Enable widget transition animation when resizing the widgets");
+    public static final BooleanFlag PREEMPTIVE_UNFOLD_ANIMATION_START = getDebugFlag(270397209,
+            "PREEMPTIVE_UNFOLD_ANIMATION_START", ENABLED,
+            "Enables starting the unfold animation preemptively when unfolding, without"
+                    + "waiting for SystemUI and then merging the SystemUI progress whenever we "
+                    + "start receiving the events");
+    // TODO(Block 23): Clean up flags
+    public static final BooleanFlag ENABLE_GRID_ONLY_OVERVIEW = getDebugFlag(270397206,
+            "ENABLE_GRID_ONLY_OVERVIEW", TEAMFOOD,
+            "Enable a grid-only overview without a focused task.");
 
-        public static final BooleanFlag ENABLE_SPLIT_LAUNCH_DATA_REFACTOR = getDebugFlag(270397202,
-                "ENABLE_SPLIT_LAUNCH_DATA_REFACTOR", DISABLED,
-                "");
+    public static final BooleanFlag ENABLE_SPLIT_LAUNCH_DATA_REFACTOR = getDebugFlag(270397202,
+            "ENABLE_SPLIT_LAUNCH_DATA_REFACTOR", DISABLED,
+            "");
 
-        public static final BooleanFlag RECEIVE_UNFOLD_EVENTS_FROM_SYSUI = getDebugFlag(270397209,
-                "RECEIVE_UNFOLD_EVENTS_FROM_SYSUI", ENABLED,
-                "Enables receiving unfold animation events from sysui instead of calculating "
-                        + "them in launcher proce");
+    public static final BooleanFlag RECEIVE_UNFOLD_EVENTS_FROM_SYSUI = getDebugFlag(270397209,
+            "RECEIVE_UNFOLD_EVENTS_FROM_SYSUI", ENABLED,
+            "Enables receiving unfold animation events from sysui instead of calculating "
+                    + "them in launcher proce");
 
-        public static final BooleanFlag ENABLE_SPLIT_FROM_WORKSPACE = getDebugFlag(270393906,
-                "ENABLE_SPLIT_FROM_WORKSPACE", ENABLED,
-                "Enable initiating split screen from workspace.");
+    public static final BooleanFlag ENABLE_SPLIT_FROM_WORKSPACE = getDebugFlag(270393906,
+            "ENABLE_SPLIT_FROM_WORKSPACE", ENABLED,
+            "Enable initiating split screen from workspace.");
 
-        public static final BooleanFlag ENABLE_CURSOR_HOVER_STATES = getDebugFlag(243191650,
-                "ENABLE_CURSOR_HOVER_STATES", TEAMFOOD,
-                "Enables cursor hover states for certain elements.");
-        // TODO(Block 24): Clean up flags
-        public static final BooleanFlag ENABLE_NEW_MIGRATION_LOGIC = getDebugFlag(270393455,
-                "ENABLE_NEW_MIGRATION_LOGIC", ENABLED,
-                "Enable the new grid migration logic, keeping pages when src < dest");
-        public static final BooleanFlag ENABLE_CACHED_WIDGET = getDebugFlag(270395008,
-                "ENABLE_CACHED_WIDGET", ENABLED,
-                "Show previously cached widgets as opposed to deferred widget where available");
-        // TODO(Block 25): Clean up flags
-        public static final BooleanFlag ENABLE_NEW_GESTURE_NAV_TUTORIAL = getDebugFlag(270396257,
-                "ENABLE_NEW_GESTURE_NAV_TUTORIAL", ENABLED,
-                "Enable the redesigned gesture navigation tutorial");
-        // TODO(Block 26): Clean up flags
-        public static final BooleanFlag ENABLE_WIDGET_HOST_IN_BACKGROUND = getDebugFlag(270394384,
-                "ENABLE_WIDGET_HOST_IN_BACKGROUND", ENABLED,
-                "Enable background widget updates listening for widget holder");
-        // TODO(Block 27): Clean up flags
-        public static final BooleanFlag ENABLE_OVERLAY_CONNECTION_OPTIM = getDebugFlag(270392629,
-                "ENABLE_OVERLAY_CONNECTION_OPTIM", DISABLED,
-                "Enable optimizing overlay service connection");
-        /**
-         * Enables region sampling for text color: Needs system health assessment before turning on
-         */
-        public static final BooleanFlag ENABLE_REGION_SAMPLING = getDebugFlag(270391669,
-                "ENABLE_REGION_SAMPLING", DISABLED,
-                "Enable region sampling to determine color of text on screen.");
-        public static final BooleanFlag ALWAYS_USE_HARDWARE_OPTIMIZATION_FOR_FOLDER_ANIMATIONS =
-                getDebugFlag(270393096, "ALWAYS_USE_HARDWARE_OPTIMIZATION_FOR_FOLDER_ANIMATIONS",
-                        DISABLED, "Always use hardware optimization for folder animations.");
-        public static final BooleanFlag SEPARATE_RECENTS_ACTIVITY = getDebugFlag(270392980,
-                "SEPARATE_RECENTS_ACTIVITY", DISABLED,
-                "Uses a separate recents activity instead of using the integrated recents+Launcher UI");
-        public static final BooleanFlag ENABLE_ENFORCED_ROUNDED_CORNERS = getReleaseFlag(270393258,
-                "ENABLE_ENFORCED_ROUNDED_CORNERS", ENABLED,
-                "Enforce rounded corners on all App Widgets");
-        public static final BooleanFlag ENABLE_ICON_LABEL_AUTO_SCALING = getDebugFlag(270393294,
-                "ENABLE_ICON_LABEL_AUTO_SCALING", ENABLED,
-                "Enables scaling/spacing for icon labels to make more characters visible");
-        public static final BooleanFlag USE_LOCAL_ICON_OVERRIDES = getDebugFlag(270394973,
-                "USE_LOCAL_ICON_OVERRIDES", ENABLED,
-                "Use inbuilt monochrome icons if app doesn't provide one");
-        // TODO(Block 28): Clean up flags
-        public static final BooleanFlag ENABLE_SPLIT_FROM_FULLSCREEN_WITH_KEYBOARD_SHORTCUTS =
-                getDebugFlag(270394122, "ENABLE_SPLIT_FROM_FULLSCREEN_SHORTCUT", DISABLED,
-                        "Enable splitting from fullscreen app with keyboard shortcuts");
-        public static final BooleanFlag ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE = getDebugFlag(
-                270393453, "ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE", DISABLED,
-                "Enable initiating split screen from workspace to workspace.");
-        public static final BooleanFlag ENABLE_SPLIT_FROM_DESKTOP_TO_WORKSPACE = getDebugFlag(
-                279586624, "ENABLE_SPLIT_FROM_DESKTOP_TO_WORKSPACE", DISABLED,
-                "Enable initiating split screen from desktop mode to workspace.");
-        public static final BooleanFlag ENABLE_TRACKPAD_GESTURE = getDebugFlag(271010401,
-                "ENABLE_TRACKPAD_GESTURE", ENABLED, "Enables trackpad gesture.");
-        // TODO(Block 29): Clean up flags
-        public static final BooleanFlag ENABLE_ALL_APPS_BUTTON_IN_HOTSEAT = getDebugFlag(270393897,
-                "ENABLE_ALL_APPS_BUTTON_IN_HOTSEAT", DISABLED,
-                "Enables displaying the all apps button in the hotseat.");
-        public static final BooleanFlag ENABLE_KEYBOARD_QUICK_SWITCH = getDebugFlag(270396844,
-                "ENABLE_KEYBOARD_QUICK_SWITCH", ENABLED, "Enables keyboard quick switching");
-        public static final BooleanFlag ENABLE_KEYBOARD_TASKBAR_TOGGLE = getDebugFlag(281726846,
-                "ENABLE_KEYBOARD_TASKBAR_TOGGLE", ENABLED,
-                "Enables keyboard taskbar stash toggling");
-        // TODO(Block 30): Clean up flags
-        public static final BooleanFlag USE_SEARCH_REQUEST_TIMEOUT_OVERRIDES = getDebugFlag(270395010,
-                "USE_SEARCH_REQUEST_TIMEOUT_OVERRIDES", DISABLED,
-                "Use local overrides for search request timeout");
-        // TODO(Block 31): Clean up flags
-        // TODO(Block 32): Clean up flags
-        public static final BooleanFlag ENABLE_RESPONSIVE_WORKSPACE = getDebugFlag(241386436,
-                "ENABLE_RESPONSIVE_WORKSPACE", ENABLED,
-                "Enables new workspace grid calculations method.");
-        // TODO(Block 33): Clean up flags
-        public static final BooleanFlag ENABLE_ALL_APPS_RV_PREINFLATION = getDebugFlag(288161355,
-                "ENABLE_ALL_APPS_RV_PREINFLATION", ENABLED,
-                "Enables preinflating all apps icons to avoid scrolling jank.");
-        // TODO(Block 34): Clean up flags
-        public static final BooleanFlag ALL_APPS_GONE_VISIBILITY = getDebugFlag(291651514,
-                "ALL_APPS_GONE_VISIBILITY", ENABLED,
-                "Set all apps container view's hidden visibility to GONE instead of INVISIBLE.");
-        // TODO(Block 35): Empty block
-        public static class BooleanFlag {
-                private final boolean mCurrentValue;
-                public BooleanFlag(boolean currentValue) {
-                        mCurrentValue = currentValue;
-                }
-                public boolean get() {
-                        return sBooleanReader.test(this);
-                }
-        }
-        /**
-         * Class representing an integer flag
-         */
-        public static class IntFlag {
-                private final int mCurrentValue;
-                public IntFlag(int currentValue) {
-                        mCurrentValue = currentValue;
-                }
-                public int get() {
-                        return sIntReader.applyAsInt(this);
-                }
-        }
-        /**
-         * Enabled state for a flag
-         */
-        public enum FlagState {
-                ENABLED,
-                DISABLED,
-                TEAMFOOD    // Enabled in team food
-        }
+    public static final BooleanFlag ENABLE_CURSOR_HOVER_STATES = getDebugFlag(243191650,
+            "ENABLE_CURSOR_HOVER_STATES", TEAMFOOD,
+            "Enables cursor hover states for certain elements.");
+    // TODO(Block 24): Clean up flags
+    public static final BooleanFlag ENABLE_NEW_MIGRATION_LOGIC = getDebugFlag(270393455,
+            "ENABLE_NEW_MIGRATION_LOGIC", ENABLED,
+            "Enable the new grid migration logic, keeping pages when src < dest");
+    public static final BooleanFlag ENABLE_CACHED_WIDGET = getDebugFlag(270395008,
+            "ENABLE_CACHED_WIDGET", ENABLED,
+            "Show previously cached widgets as opposed to deferred widget where available");
+    // TODO(Block 25): Clean up flags
+    public static final BooleanFlag ENABLE_NEW_GESTURE_NAV_TUTORIAL = getDebugFlag(270396257,
+            "ENABLE_NEW_GESTURE_NAV_TUTORIAL", ENABLED,
+            "Enable the redesigned gesture navigation tutorial");
+    // TODO(Block 26): Clean up flags
+    public static final BooleanFlag ENABLE_WIDGET_HOST_IN_BACKGROUND = getDebugFlag(270394384,
+            "ENABLE_WIDGET_HOST_IN_BACKGROUND", ENABLED,
+            "Enable background widget updates listening for widget holder");
+    // TODO(Block 27): Clean up flags
+    public static final BooleanFlag ENABLE_OVERLAY_CONNECTION_OPTIM = getDebugFlag(270392629,
+            "ENABLE_OVERLAY_CONNECTION_OPTIM", DISABLED,
+            "Enable optimizing overlay service connection");
+    /**
+     * Enables region sampling for text color: Needs system health assessment before turning on
+     */
+    public static final BooleanFlag ENABLE_REGION_SAMPLING = getDebugFlag(270391669,
+            "ENABLE_REGION_SAMPLING", DISABLED,
+            "Enable region sampling to determine color of text on screen.");
+    public static final BooleanFlag ALWAYS_USE_HARDWARE_OPTIMIZATION_FOR_FOLDER_ANIMATIONS =
+            getDebugFlag(270393096, "ALWAYS_USE_HARDWARE_OPTIMIZATION_FOR_FOLDER_ANIMATIONS",
+                    DISABLED, "Always use hardware optimization for folder animations.");
+    public static final BooleanFlag SEPARATE_RECENTS_ACTIVITY = getDebugFlag(270392980,
+            "SEPARATE_RECENTS_ACTIVITY", DISABLED,
+            "Uses a separate recents activity instead of using the integrated recents+Launcher UI");
+    public static final BooleanFlag ENABLE_ENFORCED_ROUNDED_CORNERS = getReleaseFlag(270393258,
+            "ENABLE_ENFORCED_ROUNDED_CORNERS", ENABLED,
+            "Enforce rounded corners on all App Widgets");
+    public static final BooleanFlag ENABLE_ICON_LABEL_AUTO_SCALING = getDebugFlag(270393294,
+            "ENABLE_ICON_LABEL_AUTO_SCALING", ENABLED,
+            "Enables scaling/spacing for icon labels to make more characters visible");
+    public static final BooleanFlag USE_LOCAL_ICON_OVERRIDES = getDebugFlag(270394973,
+            "USE_LOCAL_ICON_OVERRIDES", ENABLED,
+            "Use inbuilt monochrome icons if app doesn't provide one");
+    // TODO(Block 28): Clean up flags
+    public static final BooleanFlag ENABLE_SPLIT_FROM_FULLSCREEN_WITH_KEYBOARD_SHORTCUTS =
+            getDebugFlag(270394122, "ENABLE_SPLIT_FROM_FULLSCREEN_SHORTCUT", DISABLED,
+                    "Enable splitting from fullscreen app with keyboard shortcuts");
+    public static final BooleanFlag ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE = getDebugFlag(
+            270393453, "ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE", DISABLED,
+            "Enable initiating split screen from workspace to workspace.");
+    public static final BooleanFlag ENABLE_SPLIT_FROM_DESKTOP_TO_WORKSPACE = getDebugFlag(
+            279586624, "ENABLE_SPLIT_FROM_DESKTOP_TO_WORKSPACE", DISABLED,
+            "Enable initiating split screen from desktop mode to workspace.");
+    public static final BooleanFlag ENABLE_TRACKPAD_GESTURE = getDebugFlag(271010401,
+            "ENABLE_TRACKPAD_GESTURE", ENABLED, "Enables trackpad gesture.");
+    // TODO(Block 29): Clean up flags
+    public static final BooleanFlag ENABLE_ALL_APPS_BUTTON_IN_HOTSEAT = getDebugFlag(270393897,
+            "ENABLE_ALL_APPS_BUTTON_IN_HOTSEAT", DISABLED,
+            "Enables displaying the all apps button in the hotseat.");
+    public static final BooleanFlag ENABLE_KEYBOARD_QUICK_SWITCH = getDebugFlag(270396844,
+            "ENABLE_KEYBOARD_QUICK_SWITCH", ENABLED, "Enables keyboard quick switching");
+    public static final BooleanFlag ENABLE_KEYBOARD_TASKBAR_TOGGLE = getDebugFlag(281726846,
+            "ENABLE_KEYBOARD_TASKBAR_TOGGLE", ENABLED,
+            "Enables keyboard taskbar stash toggling");
+    // TODO(Block 30): Clean up flags
+    public static final BooleanFlag USE_SEARCH_REQUEST_TIMEOUT_OVERRIDES = getDebugFlag(270395010,
+            "USE_SEARCH_REQUEST_TIMEOUT_OVERRIDES", DISABLED,
+            "Use local overrides for search request timeout");
+    // TODO(Block 31): Clean up flags
+    // TODO(Block 32): Clean up flags
+    public static final BooleanFlag ENABLE_RESPONSIVE_WORKSPACE = getDebugFlag(241386436,
+            "ENABLE_RESPONSIVE_WORKSPACE", ENABLED,
+            "Enables new workspace grid calculations method.");
+    // TODO(Block 33): Clean up flags
+    public static final BooleanFlag ENABLE_ALL_APPS_RV_PREINFLATION = getDebugFlag(288161355,
+            "ENABLE_ALL_APPS_RV_PREINFLATION", ENABLED,
+            "Enables preinflating all apps icons to avoid scrolling jank.");
+    // TODO(Block 34): Clean up flags
+    public static final BooleanFlag ALL_APPS_GONE_VISIBILITY = getDebugFlag(291651514,
+            "ALL_APPS_GONE_VISIBILITY", ENABLED,
+            "Set all apps container view's hidden visibility to GONE instead of INVISIBLE.");
+    // TODO(Block 35): Empty block
+    public static class BooleanFlag {
+            private final boolean mCurrentValue;
+            public BooleanFlag(boolean currentValue) {
+                    mCurrentValue = currentValue;
+            }
+            public boolean get() {
+                    return sBooleanReader.test(this);
+            }
+    }
+    /**
+     * Class representing an integer flag
+     */
+    public static class IntFlag {
+            private final int mCurrentValue;
+            public IntFlag(int currentValue) {
+                    mCurrentValue = currentValue;
+            }
+            public int get() {
+                    return sIntReader.applyAsInt(this);
+            }
+    }
+    /**
+     * Enabled state for a flag
+     */
+    public enum FlagState {
+            ENABLED,
+            DISABLED,
+            TEAMFOOD    // Enabled in team food
+    }
 }
diff --git a/src/com/android/launcher3/folder/LauncherDelegate.java b/src/com/android/launcher3/folder/LauncherDelegate.java
index 6fea1f96d8..51a3787384 100644
--- a/src/com/android/launcher3/folder/LauncherDelegate.java
+++ b/src/com/android/launcher3/folder/LauncherDelegate.java
@@ -94,7 +94,9 @@ public class LauncherDelegate {
                         // folder
                         CellLayout cellLayout = mLauncher.getCellLayout(info.container,
                                 mLauncher.getCellPosMapper().mapModelToPresenter(info).screenId);
-                        if (cellLayout == null) return;
+                        if (cellLayout == null) {
+                            return;
+                        }
                         finalItem = info.contents.remove(0);
                         newIcon = mLauncher.createShortcut(cellLayout, finalItem);
                         mLauncher.getModelWriter().addOrMoveItemInDatabase(finalItem,