diff --git a/packages/DocumentsUI/res/menu/activity.xml b/packages/DocumentsUI/res/menu/activity.xml
index 5b944ab49af24..f23ea32b7df31 100644
--- a/packages/DocumentsUI/res/menu/activity.xml
+++ b/packages/DocumentsUI/res/menu/activity.xml
@@ -15,11 +15,6 @@
 -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/menu_create_dir"
-        android:title="@string/menu_create_dir"
-        android:icon="@drawable/ic_menu_new_folder"
-        android:showAsAction="always" />
     <item
         android:id="@+id/menu_search"
         android:title="@string/menu_search"
@@ -27,6 +22,11 @@
         android:showAsAction="always|collapseActionView"
         android:actionViewClass="android.widget.SearchView"
         android:imeOptions="actionSearch" />
+    <item
+        android:id="@+id/menu_create_dir"
+        android:title="@string/menu_create_dir"
+        android:icon="@drawable/ic_menu_new_folder"
+        android:showAsAction="always" />
     <item
         android:id="@+id/menu_sort"
         android:title="@string/menu_sort"
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java
index b89ccd5226b8d..ed93d9898dd7c 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java
@@ -56,6 +56,7 @@ import android.os.Bundle;
 import android.os.CancellationSignal;
 import android.os.OperationCanceledException;
 import android.os.Parcelable;
+import android.os.SystemProperties;
 import android.provider.DocumentsContract;
 import android.provider.DocumentsContract.Document;
 import android.text.format.DateUtils;
@@ -133,6 +134,8 @@ public class DirectoryFragment extends Fragment {
     private DocumentsAdapter mAdapter;
     private LoaderCallbacks<DirectoryResult> mCallbacks;
 
+    private static final boolean DEBUG_ENABLE_DND = false;
+
     private static final String EXTRA_TYPE = "type";
     private static final String EXTRA_ROOT = "root";
     private static final String EXTRA_DOC = "doc";
@@ -208,7 +211,6 @@ public class DirectoryFragment extends Fragment {
         mListView.setOnItemClickListener(mItemListener);
         mListView.setMultiChoiceModeListener(mMultiListener);
         mListView.setRecyclerListener(mRecycleListener);
-        setupDragAndDropOnDirectoryView(mListView);
 
         // Indent our list divider to align with text
         final Drawable divider = mListView.getDivider();
@@ -224,7 +226,11 @@ public class DirectoryFragment extends Fragment {
         mGridView.setOnItemClickListener(mItemListener);
         mGridView.setMultiChoiceModeListener(mMultiListener);
         mGridView.setRecyclerListener(mRecycleListener);
-        setupDragAndDropOnDirectoryView(mGridView);
+
+        if (DEBUG_ENABLE_DND) {
+            setupDragAndDropOnDirectoryView(mListView);
+            setupDragAndDropOnDirectoryView(mGridView);
+        }
 
         return view;
     }
@@ -1010,7 +1016,9 @@ public class DirectoryFragment extends Fragment {
             if (icon1 != null) icon1.setAlpha(iconAlpha);
             if (icon2 != null) icon2.setAlpha(iconAlpha);
 
-            setupDragAndDropOnDocumentView(convertView, cursor);
+            if (DEBUG_ENABLE_DND) {
+                setupDragAndDropOnDocumentView(convertView, cursor);
+            }
 
             return convertView;
         }
diff --git a/packages/DocumentsUI/src/com/android/documentsui/StandaloneActivity.java b/packages/DocumentsUI/src/com/android/documentsui/StandaloneActivity.java
index 72cfdc633aee9..c15efb0f13ba1 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/StandaloneActivity.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/StandaloneActivity.java
@@ -200,9 +200,9 @@ public class StandaloneActivity extends BaseActivity {
                 && !mSearchManager.isSearching()
                 && !root.isDownloads());
 
-        fileSize.setVisible(cwd != null);
-        advanced.setVisible(cwd != null);
-
+        createDir.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+        fileSize.setVisible(true);
+        advanced.setVisible(true);
         settings.setVisible((root.flags & Root.FLAG_HAS_SETTINGS) != 0);
 
         return shown;