diff --git a/device/overlay/packages/apps/Camera2/res/layout-land/camera_controls.xml b/device/overlay/packages/apps/Camera2/res/layout-land/camera_controls.xml
index 9c98d0cf..cb62a855 100644
--- a/device/overlay/packages/apps/Camera2/res/layout-land/camera_controls.xml
+++ b/device/overlay/packages/apps/Camera2/res/layout-land/camera_controls.xml
@@ -42,12 +42,12 @@
             android:layout_gravity="right|top"
             android:layout_marginRight="2dip" />
 
-        <com.android.camera.ui.ModuleSwitcher
+        <!--com.android.camera.ui.ModuleSwitcher
             android:id="@+id/camera_switcher"
             style="@style/SwitcherButton"
             android:layout_gravity="right|bottom"
             android:layout_marginRight="2dip"
-            android:contentDescription="@string/accessibility_mode_picker" />
+            android:contentDescription="@string/accessibility_mode_picker" /-->
 
         <com.android.camera.ShutterButton
             android:id="@+id/shutter_button"
diff --git a/device/overlay/packages/apps/Camera2/res/layout-port/camera_controls.xml b/device/overlay/packages/apps/Camera2/res/layout-port/camera_controls.xml
index 72289447..d1103d3c 100644
--- a/device/overlay/packages/apps/Camera2/res/layout-port/camera_controls.xml
+++ b/device/overlay/packages/apps/Camera2/res/layout-port/camera_controls.xml
@@ -42,12 +42,12 @@
             android:layout_marginBottom="2dip"
             android:contentDescription="@string/accessibility_menu_button" />
 
-        <com.android.camera.ui.ModuleSwitcher
+        <!--com.android.camera.ui.ModuleSwitcher
            android:id="@+id/camera_switcher"
            style="@style/SwitcherButton"
            android:layout_gravity="bottom|left"
            android:layout_marginBottom="2dip"
-           android:contentDescription="@string/accessibility_mode_picker" />
+           android:contentDescription="@string/accessibility_mode_picker" /-->
 
         <com.android.camera.ShutterButton
             android:id="@+id/shutter_button"