diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java
index ec914d8..b7c45a3 100644
--- a/src/com/android/launcher3/LauncherAppState.java
+++ b/src/com/android/launcher3/LauncherAppState.java
@@ -195,6 +195,13 @@
 
     @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
     DeviceProfile initDynamicGrid(Context context) {
+        mDynamicGrid = createDynamicGrid(context, mDynamicGrid);
+        mDynamicGrid.getDeviceProfile().addCallback(this);
+        return mDynamicGrid.getDeviceProfile();
+    }
+
+    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
+    static DynamicGrid createDynamicGrid(Context context, DynamicGrid dynamicGrid) {
         // Determine the dynamic grid properties
         WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
         Display display = wm.getDefaultDisplay();
@@ -204,27 +211,27 @@
         DisplayMetrics dm = new DisplayMetrics();
         display.getMetrics(dm);
 
-        if (mDynamicGrid == null) {
+        if (dynamicGrid == null) {
             Point smallestSize = new Point();
             Point largestSize = new Point();
             display.getCurrentSizeRange(smallestSize, largestSize);
 
-            mDynamicGrid = new DynamicGrid(context,
+            dynamicGrid = new DynamicGrid(context,
                     context.getResources(),
                     Math.min(smallestSize.x, smallestSize.y),
                     Math.min(largestSize.x, largestSize.y),
                     realSize.x, realSize.y,
                     dm.widthPixels, dm.heightPixels);
-            mDynamicGrid.getDeviceProfile().addCallback(this);
         }
 
         // Update the icon size
-        DeviceProfile grid = mDynamicGrid.getDeviceProfile();
+        DeviceProfile grid = dynamicGrid.getDeviceProfile();
         grid.updateFromConfiguration(context, context.getResources(),
                 realSize.x, realSize.y,
                 dm.widthPixels, dm.heightPixels);
-        return grid;
+        return dynamicGrid;
     }
+
     public DynamicGrid getDynamicGrid() {
         return mDynamicGrid;
     }
diff --git a/src/com/android/launcher3/LauncherBackupHelper.java b/src/com/android/launcher3/LauncherBackupHelper.java
index c260fbc..4374347 100644
--- a/src/com/android/launcher3/LauncherBackupHelper.java
+++ b/src/com/android/launcher3/LauncherBackupHelper.java
@@ -371,16 +371,9 @@
         if (mCurrentProfile != null) {
             return mCurrentProfile;
         }
-        LauncherAppState.setApplicationContext(mContext.getApplicationContext());
-        LauncherAppState app = LauncherAppState.getInstance();
-
-        DeviceProfile profile;
-        if (app.getDynamicGrid() == null) {
-            // Initialize the grid
-            profile = app.initDynamicGrid(mContext);
-        } else {
-            profile = app.getDynamicGrid().getDeviceProfile();
-        }
+        final Context applicationContext = mContext.getApplicationContext();
+        DeviceProfile profile = LauncherAppState.createDynamicGrid(applicationContext, null)
+                .getDeviceProfile();
 
         mCurrentProfile = new DeviceProfieData();
         mCurrentProfile.desktopRows = profile.numRows;