diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java
index 7b96d651..f94ed78 100644
--- a/src/com/android/launcher3/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -126,7 +126,7 @@
         fi.container = LauncherSettings.Favorites.CONTAINER_HOTSEAT;
         fi.screenId = mAllAppsButtonRank;
         fi.itemType = LauncherSettings.Favorites.ITEM_TYPE_FOLDER;
-        fi.title = "All Apps";
+        fi.title = "More Apps";
         LauncherModel.addItemToDatabase(launcher, fi, fi.container, fi.screenId, fi.cellX,
                 fi.cellY, false);
         FolderIcon folder = FolderIcon.fromXml(R.layout.folder_icon, launcher,
@@ -137,7 +137,7 @@
         for (ApplicationInfo info: allApps) {
             ComponentName cn = info.intent.getComponent();
             if (!onWorkspace.contains(cn)) {
-                Log.d(TAG, "Adding to all apps: " + info.intent);
+                Log.d(TAG, "Adding to 'more apps': " + info.intent);
                 ShortcutInfo si = info.makeShortcut();
                 fi.add(si);
             }
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 6cebe42..890c632 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -193,6 +193,7 @@
             "com.android.launcher.toolbar_voice_search_icon";
 
     public static final String SHOW_WEIGHT_WATCHER = "debug.show_mem";
+    public static final boolean SHOW_WEIGHT_WATCHER_DEFAULT = false;
 
     /** The different states that Launcher can be in. */
     private enum State { NONE, WORKSPACE, APPS_CUSTOMIZE, APPS_CUSTOMIZE_SPRING_LOADED };
@@ -3569,7 +3570,7 @@
     private boolean shouldShowWeightWatcher() {
         String spKey = LauncherAppState.getSharedPreferencesKey();
         SharedPreferences sp = getSharedPreferences(spKey, Context.MODE_PRIVATE);
-        boolean show = sp.getBoolean(SHOW_WEIGHT_WATCHER, true);
+        boolean show = sp.getBoolean(SHOW_WEIGHT_WATCHER, SHOW_WEIGHT_WATCHER_DEFAULT);
 
         return show;
     }
