diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 7e75f97..41f36eb 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -27,7 +27,6 @@
 import android.content.Intent;
 import android.content.Intent.ShortcutIconResource;
 import android.content.IntentFilter;
-import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.pm.ProviderInfo;
 import android.content.pm.ResolveInfo;
@@ -1761,6 +1760,8 @@
 
 
             if (MigrateFromRestoreTask.shouldRunTask(mContext)) {
+                long migrationStartTime = System.currentTimeMillis();
+                Log.v(TAG, "Starting workspace migration after restore");
                 try {
                     MigrateFromRestoreTask task = new MigrateFromRestoreTask(mContext);
                     // Clear the flags before starting the task, so that we do not run the task
@@ -1773,6 +1774,8 @@
                     // Clear workspace.
                     mFlags = mFlags | LOADER_FLAG_CLEAR_WORKSPACE;
                 }
+                Log.v(TAG, "Workspace migration completed in "
+                        + (System.currentTimeMillis() - migrationStartTime));
             }
 
             if ((mFlags & LOADER_FLAG_CLEAR_WORKSPACE) != 0) {
diff --git a/src/com/android/launcher3/model/MigrateFromRestoreTask.java b/src/com/android/launcher3/model/MigrateFromRestoreTask.java
index cb90c8b..8d4472f 100644
--- a/src/com/android/launcher3/model/MigrateFromRestoreTask.java
+++ b/src/com/android/launcher3/model/MigrateFromRestoreTask.java
@@ -38,7 +38,7 @@
 public class MigrateFromRestoreTask {
 
     private static final String TAG = "MigrateFromRestoreTask";
-    private static final boolean DEBUG = false;
+    private static final boolean DEBUG = true;
 
     private static final String KEY_MIGRATION_SOURCE_SIZE = "migration_restore_src_size";
     private static final String KEY_MIGRATION_WIDGET_MINSIZE = "migration_widget_min_size";
