diff --git a/quickstep/src/com/android/launcher3/uioverrides/flags/FlagsFactory.java b/quickstep/src/com/android/launcher3/uioverrides/flags/FlagsFactory.java
index ff5904d69b..c53517b23b 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/flags/FlagsFactory.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/flags/FlagsFactory.java
@@ -69,7 +69,7 @@ public class FlagsFactory {
      */
     public static BooleanFlag getDebugFlag(
             int bugId, String key, boolean defaultValue, String description) {
-        if (true) { // Utilities.IS_DEBUG_DEVICE)
+        if (true) { // Utilities.IS_DEBUG_DEVICE
             SharedPreferences prefs = currentApplication()
                     .getSharedPreferences(FLAGS_PREF_NAME, Context.MODE_PRIVATE);
             boolean currentValue = prefs.getBoolean(key, defaultValue);
@@ -88,7 +88,7 @@ public class FlagsFactory {
             int bugId, String key, boolean defaultValueInCode, String description) {
         INSTANCE.mKeySet.add(key);
         boolean defaultValue = DeviceConfig.getBoolean(NAMESPACE_LAUNCHER, key, defaultValueInCode);
-        if (Utilities.IS_DEBUG_DEVICE) {
+        if (true) { // Utilities.IS_DEBUG_DEVICE
             SharedPreferences prefs = currentApplication()
                     .getSharedPreferences(FLAGS_PREF_NAME, Context.MODE_PRIVATE);
             boolean currentValue = prefs.getBoolean(key, defaultValue);
@@ -111,9 +111,9 @@ public class FlagsFactory {
     }
 
     static List<DebugFlag> getDebugFlags() {
-        if (!Utilities.IS_DEBUG_DEVICE) {
+        /*if (!Utilities.IS_DEBUG_DEVICE) {
             return Collections.emptyList();
-        }
+        }*/
         synchronized (sDebugFlags) {
             return new ArrayList<>(sDebugFlags);
         }
@@ -123,9 +123,9 @@ public class FlagsFactory {
      * Dumps the current flags state to the print writer
      */
     public static void dump(PrintWriter pw) {
-        if (!Utilities.IS_DEBUG_DEVICE) {
+        /*if (!Utilities.IS_DEBUG_DEVICE) {
             return;
-        }
+        }*/
         pw.println("DeviceFlags:");
         synchronized (sDebugFlags) {
             for (DebugFlag flag : sDebugFlags) {
diff --git a/res/xml/launcher_preferences.xml b/res/xml/launcher_preferences.xml
index a8cae9a7af..83c9e5dd29 100644
--- a/res/xml/launcher_preferences.xml
+++ b/res/xml/launcher_preferences.xml
@@ -167,6 +167,12 @@
             android:defaultValue="false"
             android:persistent="true" />
 
+        <Preference
+            android:key="pref_developer_options"
+            android:persistent="false"
+            android:title="Developer Options"
+            android:fragment="com.android.launcher3.uioverrides.flags.DeveloperOptionsFragment"/>
+
     </androidx.preference.PreferenceCategory>
 
 </androidx.preference.PreferenceScreen>