diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index dd9120f..cbb06f6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -83,7 +83,8 @@
             style="@style/Theme.WallpaperPicker"
             android:label="@string/pick_wallpaper"
             android:icon="@drawable/ic_launcher_wallpaper"
-            android:finishOnCloseSystemDialogs="true">
+            android:finishOnCloseSystemDialogs="true"
+            android:process=":wallpaper_chooser">
             <intent-filter>
                 <action android:name="android.intent.action.SET_WALLPAPER" />
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java
index 32b1787..4f5d835 100644
--- a/src/com/android/launcher2/AppsCustomizePagedView.java
+++ b/src/com/android/launcher2/AppsCustomizePagedView.java
@@ -130,9 +130,8 @@
  * A generic template for an async task used in AppsCustomize.
  */
 class AppsCustomizeAsyncTask extends AsyncTask<AsyncTaskPageData, Void, AsyncTaskPageData> {
-    AppsCustomizeAsyncTask(int p, AppsCustomizePagedView.ContentType t, AsyncTaskPageData.Type ty) {
+    AppsCustomizeAsyncTask(int p, AsyncTaskPageData.Type ty) {
         page = p;
-        pageContentType = t;
         threadPriority = Process.THREAD_PRIORITY_DEFAULT;
         dataType = ty;
     }
@@ -159,7 +158,6 @@
     // The page that this async task is associated with
     AsyncTaskPageData.Type dataType;
     int page;
-    AppsCustomizePagedView.ContentType pageContentType;
     int threadPriority;
 }
 
@@ -186,10 +184,8 @@
 
     // Save and Restore
     private int mSaveInstanceStateItemIndex = -1;
-    private int mRestorePage = -1;
 
     // Content
-    private ContentType mContentType;
     private ArrayList<ApplicationInfo> mApps;
     private ArrayList<Object> mWidgets;
 
@@ -212,6 +208,8 @@
     private final int mWidgetPreviewIconPaddedDimension;
     private final float sWidgetPreviewIconPaddingPercentage = 0.25f;
     private PagedViewCellLayout mWidgetSpacingLayout;
+    private int mNumAppsPages;
+    private int mNumWidgetPages;
 
     // Relating to the scroll and overscroll effects
     Workspace.ZInterpolator mZInterpolator = new Workspace.ZInterpolator(0.5f);
@@ -231,7 +229,6 @@
         super(context, attrs);
         mLayoutInflater = LayoutInflater.from(context);
         mPackageManager = context.getPackageManager();
-        mContentType = ContentType.Applications;
         mApps = new ArrayList<ApplicationInfo>();
         mWidgets = new ArrayList<Object>();
         mIconCache = ((LauncherApplication) context.getApplicationContext()).getIconCache();
@@ -298,24 +295,23 @@
         int i = -1;
         if (getPageCount() > 0) {
             int currentPage = getCurrentPage();
-            switch (mContentType) {
-            case Applications: {
+            if (currentPage < mNumAppsPages) {
                 PagedViewCellLayout layout = (PagedViewCellLayout) getPageAt(currentPage);
                 PagedViewCellLayoutChildren childrenLayout = layout.getChildrenLayout();
                 int numItemsPerPage = mCellCountX * mCellCountY;
                 int childCount = childrenLayout.getChildCount();
                 if (childCount > 0) {
                     i = (currentPage * numItemsPerPage) + (childCount / 2);
-                }}
-                break;
-            case Widgets: {
+                }
+            } else {
+                int numApps = mApps.size();
                 PagedViewGridLayout layout = (PagedViewGridLayout) getPageAt(currentPage);
                 int numItemsPerPage = mWidgetCountX * mWidgetCountY;
                 int childCount = layout.getChildCount();
                 if (childCount > 0) {
-                    i = (currentPage * numItemsPerPage) + (childCount / 2);
-                }}
-                break;
+                    i = numApps +
+                        ((currentPage - mNumAppsPages) * numItemsPerPage) + (childCount / 2);
+                }
             }
         }
         return i;
@@ -332,16 +328,15 @@
     /** Returns the page in the current orientation which is expected to contain the specified
      *  item index. */
     int getPageForComponent(int index) {
-        switch (mContentType) {
-        case Applications: {
+        if (index < 0) return 0;
+
+        if (index < mApps.size()) {
             int numItemsPerPage = mCellCountX * mCellCountY;
             return (index / numItemsPerPage);
-        }
-        case Widgets: {
+        } else {
             int numItemsPerPage = mWidgetCountX * mWidgetCountY;
-            return (index / numItemsPerPage);
-        }}
-        return -1;
+            return mNumAppsPages + ((index - mApps.size()) / numItemsPerPage);
+        }
     }
 
     /**
@@ -350,25 +345,14 @@
     private boolean testDataReady() {
         // We only do this test once, and we default to the Applications page, so we only really
         // have to wait for there to be apps.
-        if (mContentType == AppsCustomizePagedView.ContentType.Widgets) {
-            return !mApps.isEmpty() && !mWidgets.isEmpty();
-        } else {
-            return !mApps.isEmpty();
-        }
+        // TODO: What if one of them is validly empty
+        return !mApps.isEmpty() && !mWidgets.isEmpty();
     }
 
     /** Restores the page for an item at the specified index */
     void restorePageForIndex(int index) {
         if (index < 0) return;
-
-        int page = getPageForComponent(index);
-        if (page > -1) {
-            if (getChildCount() > 0) {
-                invalidatePageData(page);
-            } else {
-                mRestorePage = page;
-            }
-        }
+        mSaveInstanceStateItemIndex = index;
     }
 
     protected void onDataReady(int width, int height) {
@@ -392,14 +376,19 @@
         mWidgetSpacingLayout.calculateCellCount(width, height, maxCellCountX, maxCellCountY);
         mCellCountX = mWidgetSpacingLayout.getCellCountX();
         mCellCountY = mWidgetSpacingLayout.getCellCountY();
+        mNumWidgetPages = (int) Math.ceil(mWidgets.size() /
+                (float) (mWidgetCountX * mWidgetCountY));
+        mNumAppsPages = (int) Math.ceil((float) mApps.size() / (mCellCountX * mCellCountY));
 
         // Force a measure to update recalculate the gaps
         int widthSpec = MeasureSpec.makeMeasureSpec(getMeasuredWidth(), MeasureSpec.AT_MOST);
         int heightSpec = MeasureSpec.makeMeasureSpec(getMeasuredHeight(), MeasureSpec.AT_MOST);
         mWidgetSpacingLayout.measure(widthSpec, heightSpec);
         mContentWidth = mWidgetSpacingLayout.getContentWidth();
-        invalidatePageData(Math.max(0, mRestorePage));
-        mRestorePage = -1;
+
+        // Restore the page
+        int page = getPageForComponent(mSaveInstanceStateItemIndex);
+        invalidatePageData(Math.max(0, page));
 
         int[] offset = new int[2];
         int[] pos = mWidgetSpacingLayout.estimateCellPosition(mClingFocusedX, mClingFocusedY);
@@ -472,6 +461,7 @@
             // a layout to do this test and invalidate the page data when ready.
             if (testDataReady()) requestLayout();
         } else {
+            cancelAllTasks();
             invalidatePageData();
         }
     }
@@ -625,7 +615,10 @@
     @Override
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
+        cancelAllTasks();
+    }
 
+    private void cancelAllTasks() {
         // Clean up all the async tasks
         Iterator<AppsCustomizeAsyncTask> iter = mRunningTasks.iterator();
         while (iter.hasNext()) {
@@ -636,18 +629,34 @@
     }
 
     public void setContentType(ContentType type) {
-        mContentType = type;
-        invalidatePageData(0, (type != ContentType.Applications));
-    }
-
-    public boolean isContentType(ContentType type) {
-        return (mContentType == type);
+        if (type == ContentType.Widgets) {
+            invalidatePageData(mNumAppsPages, true);
+        } else if (type == ContentType.Applications) {
+            invalidatePageData(0, true);
+        }
     }
 
     public void setCurrentPageToWidgets() {
         invalidatePageData(0);
     }
 
+    protected void snapToPage(int whichPage, int delta, int duration) {
+        super.snapToPage(whichPage, delta, duration);
+        updateCurrentTab(whichPage);
+    }
+
+    private void updateCurrentTab(int currentPage) {
+        AppsCustomizeTabHost tabHost = getTabHost();
+        String tag = tabHost.getCurrentTabTag();
+        if (currentPage >= mNumAppsPages &&
+                !tag.equals(tabHost.getTabTagForContentType(ContentType.Widgets))) {
+            tabHost.setCurrentTabFromContent(ContentType.Widgets);
+        } else if (currentPage < mNumAppsPages &&
+                !tag.equals(tabHost.getTabTagForContentType(ContentType.Applications))) {
+            tabHost.setCurrentTabFromContent(ContentType.Applications);
+        }
+    }
+
     /*
      * Apps PagedView implementation
      */
@@ -674,16 +683,7 @@
         layout.measure(widthSpec, heightSpec);
         setVisibilityOnChildren(layout, View.VISIBLE);
     }
-    public void syncAppsPages() {
-        // Ensure that we have the right number of pages
-        Context context = getContext();
-        int numPages = (int) Math.ceil((float) mApps.size() / (mCellCountX * mCellCountY));
-        for (int i = 0; i < numPages; ++i) {
-            PagedViewCellLayout layout = new PagedViewCellLayout(context);
-            setupPage(layout);
-            addView(layout);
-        }
-    }
+
     public void syncAppsPageItems(int page, boolean immediate) {
         // ensure that we have the right number of items on the pages
         int numCells = mCellCountX * mCellCountY;
@@ -754,17 +754,17 @@
             AppsCustomizeAsyncTask task = (AppsCustomizeAsyncTask) iter.next();
             int taskPage = task.page;
             if ((taskPage == page) ||
-                    taskPage < getAssociatedLowerPageBound(mCurrentPage) ||
-                    taskPage > getAssociatedUpperPageBound(mCurrentPage)) {
+                    taskPage < getAssociatedLowerPageBound(mCurrentPage - mNumAppsPages) ||
+                    taskPage > getAssociatedUpperPageBound(mCurrentPage - mNumAppsPages)) {
                 task.cancel(false);
                 iter.remove();
             } else {
-                task.setThreadPriority(getThreadPriorityForPage(taskPage));
+                task.setThreadPriority(getThreadPriorityForPage(taskPage + mNumAppsPages));
             }
         }
 
         // We introduce a slight delay to order the loading of side pages so that we don't thrash
-        final int sleepMs = getSleepForPage(page);
+        final int sleepMs = getSleepForPage(page + mNumAppsPages);
         AsyncTaskPageData pageData = new AsyncTaskPageData(page, widgets, cellWidth, cellHeight,
             cellCountX, new AsyncTaskCallback() {
                 @Override
@@ -787,8 +787,6 @@
                     try {
                         mRunningTasks.remove(task);
                         if (task.isCancelled()) return;
-                        if (task.page > getPageCount()) return;
-                        if (task.pageContentType != mContentType) return;
                         onSyncWidgetPageItems(data);
                     } finally {
                         data.cleanup(task.isCancelled());
@@ -797,7 +795,7 @@
             });
 
         // Ensure that the task is appropriately prioritized and runs in parallel
-        AppsCustomizeAsyncTask t = new AppsCustomizeAsyncTask(page, mContentType,
+        AppsCustomizeAsyncTask t = new AppsCustomizeAsyncTask(page,
                 AsyncTaskPageData.Type.LoadWidgetPreviewData);
         t.setThreadPriority(getThreadPriorityForPage(page));
         t.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, pageData);
@@ -862,8 +860,6 @@
                     try {
                         mRunningTasks.remove(task);
                         if (task.isCancelled()) return;
-                        if (task.page > getPageCount()) return;
-                        if (task.pageContentType != mContentType) return;
                         onHolographicPageItemsLoaded(data);
                     } finally {
                         data.cleanup(task.isCancelled());
@@ -873,8 +869,7 @@
 
         // Ensure that the outline task always runs in the background, serially
         AppsCustomizeAsyncTask t =
-            new AppsCustomizeAsyncTask(page, mContentType,
-                    AsyncTaskPageData.Type.LoadHolographicIconsData);
+            new AppsCustomizeAsyncTask(page, AsyncTaskPageData.Type.LoadHolographicIconsData);
         t.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND);
         t.executeOnExecutor(AsyncTask.SERIAL_EXECUTOR, pageData);
         mRunningTasks.add(t);
@@ -894,6 +889,7 @@
         layout.setMinimumWidth(getPageContentWidth());
         layout.measure(widthSpec, heightSpec);
     }
+
     private void renderDrawableToBitmap(Drawable d, Bitmap bitmap, int x, int y, int w, int h) {
         renderDrawableToBitmap(d, bitmap, x, y, w, h, 1f, 0xFFFFFFFF);
     }
@@ -1008,19 +1004,7 @@
         }
         return preview;
     }
-    public void syncWidgetPages() {
-        // Ensure that we have the right number of pages
-        Context context = getContext();
-        int numPages = (int) Math.ceil(mWidgets.size() /
-                (float) (mWidgetCountX * mWidgetCountY));
-        for (int j = 0; j < numPages; ++j) {
-            PagedViewGridLayout layout = new PagedViewGridLayout(context, mWidgetCountX,
-                    mWidgetCountY);
-            setupPage(layout);
-            addView(layout, new PagedViewGridLayout.LayoutParams(LayoutParams.MATCH_PARENT,
-                    LayoutParams.MATCH_PARENT));
-        }
-    }
+
     public void syncWidgetPageItems(int page, boolean immediate) {
         int numItemsPerPage = mWidgetCountX * mWidgetCountY;
         int contentWidth = mWidgetSpacingLayout.getContentWidth();
@@ -1040,7 +1024,7 @@
         }
 
         // Prepopulate the pages with the other widget info, and fill in the previews later
-        PagedViewGridLayout layout = (PagedViewGridLayout) getPageAt(page);
+        PagedViewGridLayout layout = (PagedViewGridLayout) getPageAt(page + mNumAppsPages);
         layout.setColumnCount(layout.getCellCountX());
         for (int i = 0; i < items.size(); ++i) {
             Object rawInfo = items.get(i);
@@ -1130,7 +1114,7 @@
     }
     private void onSyncWidgetPageItems(AsyncTaskPageData data) {
         int page = data.page;
-        PagedViewGridLayout layout = (PagedViewGridLayout) getPageAt(page);
+        PagedViewGridLayout layout = (PagedViewGridLayout) getPageAt(page + mNumAppsPages);
 
         ArrayList<Object> items = data.items;
         int count = items.size();
@@ -1183,33 +1167,30 @@
     @Override
     public void syncPages() {
         removeAllViews();
+        cancelAllTasks();
 
-        // Remove all background asyc tasks if we are loading content anew
-        Iterator<AppsCustomizeAsyncTask> iter = mRunningTasks.iterator();
-        while (iter.hasNext()) {
-            AppsCustomizeAsyncTask task = (AppsCustomizeAsyncTask) iter.next();
-            task.cancel(false);
-            iter.remove();
+        Context context = getContext();
+        for (int j = 0; j < mNumWidgetPages; ++j) {
+            PagedViewGridLayout layout = new PagedViewGridLayout(context, mWidgetCountX,
+                    mWidgetCountY);
+            setupPage(layout);
+            addView(layout, new PagedViewGridLayout.LayoutParams(LayoutParams.MATCH_PARENT,
+                    LayoutParams.MATCH_PARENT));
         }
 
-        switch (mContentType) {
-        case Applications:
-            syncAppsPages();
-            break;
-        case Widgets:
-            syncWidgetPages();
-            break;
+        for (int i = 0; i < mNumAppsPages; ++i) {
+            PagedViewCellLayout layout = new PagedViewCellLayout(context);
+            setupPage(layout);
+            addView(layout);
         }
     }
+
     @Override
     public void syncPageItems(int page, boolean immediate) {
-        switch (mContentType) {
-        case Applications:
+        if (page < mNumAppsPages) {
             syncAppsPageItems(page, immediate);
-            break;
-        case Widgets:
-            syncWidgetPageItems(page, immediate);
-            break;
+        } else {
+            syncWidgetPageItems(page - mNumAppsPages, immediate);
         }
     }
 
@@ -1287,30 +1268,7 @@
     }
 
     @Override
-    protected void onPageBeginMoving() {
-        /* TO BE ENABLED LATER
-        setChildrenDrawnWithCacheEnabled(true);
-        for (int i = 0; i < getChildCount(); ++i) {
-            View v = getChildAt(i);
-            if (v instanceof PagedViewCellLayout) {
-                ((PagedViewCellLayout) v).setChildrenDrawingCacheEnabled(true);
-            }
-        }
-        */
-        super.onPageBeginMoving();
-    }
-
-    @Override
     protected void onPageEndMoving() {
-        /* TO BE ENABLED LATER
-        for (int i = 0; i < getChildCount(); ++i) {
-            View v = getChildAt(i);
-            if (v instanceof PagedViewCellLayout) {
-                ((PagedViewCellLayout) v).setChildrenDrawingCacheEnabled(false);
-            }
-        }
-        setChildrenDrawnWithCacheEnabled(false);
-        */
         super.onPageEndMoving();
 
         // We reset the save index when we change pages so that it will be recalculated on next
@@ -1402,15 +1360,14 @@
 
     @Override
     public void reset() {
-        if (mContentType != ContentType.Applications) {
-            // Reset to the first page of the Apps pane
-            AppsCustomizeTabHost tabs = (AppsCustomizeTabHost)
-                    mLauncher.findViewById(R.id.apps_customize_pane);
-            tabs.selectAppsTab();
-        } else if (getCurrentPage() != 0) {
-            invalidatePageData(0);
-        }
+        updateCurrentTab(0);
+        invalidatePageData(0);
     }
+
+    private AppsCustomizeTabHost getTabHost() {
+        return (AppsCustomizeTabHost) mLauncher.findViewById(R.id.apps_customize_pane);
+    }
+
     @Override
     public void dumpState() {
         // TODO: Dump information related to current list of Applications, Widgets, etc.
@@ -1456,14 +1413,14 @@
     protected String getCurrentPageDescription() {
         int page = (mNextPage != INVALID_PAGE) ? mNextPage : mCurrentPage;
         int stringId = R.string.default_scroll_format;
-        switch (mContentType) {
-        case Applications:
+
+        if (page < mNumAppsPages) {
             stringId = R.string.apps_customize_apps_scroll_format;
-            break;
-        case Widgets:
+        } else {
+            page -= mNumAppsPages;
             stringId = R.string.apps_customize_widgets_scroll_format;
-            break;
         }
+
         return String.format(mContext.getString(stringId), page + 1, getChildCount());
     }
 }
diff --git a/src/com/android/launcher2/AppsCustomizeTabHost.java b/src/com/android/launcher2/AppsCustomizeTabHost.java
index d37b1c9..404b088 100644
--- a/src/com/android/launcher2/AppsCustomizeTabHost.java
+++ b/src/com/android/launcher2/AppsCustomizeTabHost.java
@@ -48,6 +48,7 @@
     private ViewGroup mTabs;
     private ViewGroup mTabsContainer;
     private AppsCustomizePagedView mAppsCustomizePane;
+    private boolean mSuppressContentCallback = false;
     private ImageView mAnimationBuffer;
 
     private boolean mInTransition;
@@ -167,6 +168,7 @@
     private void onTabChangedStart() {
         mAppsCustomizePane.hideScrollingIndicator(false);
     }
+
     private void onTabChangedEnd(AppsCustomizePagedView.ContentType type) {
         mAppsCustomizePane.setContentType(type);
     }
@@ -174,59 +176,67 @@
     @Override
     public void onTabChanged(String tabId) {
         final AppsCustomizePagedView.ContentType type = getContentTypeForTabTag(tabId);
-        if (!mAppsCustomizePane.isContentType(type)) {
-            // Animate the changing of the tab content by fading pages in and out
-            final Resources res = getResources();
-            final int duration = res.getInteger(R.integer.config_tabTransitionDuration);
-
-            // We post a runnable here because there is a delay while the first page is loading and
-            // the feedback from having changed the tab almost feels better than having it stick
-            post(new Runnable() {
-                @Override
-                public void run() {
-                    // Setup the animation buffer
-                    Bitmap b = Bitmap.createBitmap(mAppsCustomizePane.getMeasuredWidth(),
-                            mAppsCustomizePane.getMeasuredHeight(), Bitmap.Config.ARGB_8888);
-                    Canvas c = new Canvas(b);
-                    mAppsCustomizePane.draw(c);
-                    mAppsCustomizePane.setAlpha(0f);
-                    mAnimationBuffer.setImageBitmap(b);
-                    mAnimationBuffer.setAlpha(1f);
-                    mAnimationBuffer.setVisibility(View.VISIBLE);
-                    c.setBitmap(null);
-                    b = null;
-
-                    // Toggle the new content
-                    onTabChangedStart();
-                    onTabChangedEnd(type);
-
-                    // Animate the transition
-                    ObjectAnimator outAnim = ObjectAnimator.ofFloat(mAnimationBuffer, "alpha", 0f);
-                    outAnim.addListener(new AnimatorListenerAdapter() {
-                        @Override
-                        public void onAnimationEnd(Animator animation) {
-                            mAnimationBuffer.setVisibility(View.GONE);
-                            mAnimationBuffer.setImageBitmap(null);
-                        }
-                    });
-                    ObjectAnimator inAnim = ObjectAnimator.ofFloat(mAppsCustomizePane, "alpha", 1f);
-                    inAnim.addListener(new AnimatorListenerAdapter() {
-                        @Override
-                        public void onAnimationEnd(Animator animation) {
-                            if (!LauncherApplication.isScreenLarge()) {
-                                mAppsCustomizePane.flashScrollingIndicator();
-                            }
-                            mAppsCustomizePane.loadAssociatedPages(
-                                    mAppsCustomizePane.getCurrentPage());
-                        }
-                    });
-                    AnimatorSet animSet = new AnimatorSet();
-                    animSet.playTogether(outAnim, inAnim);
-                    animSet.setDuration(duration);
-                    animSet.start();
-                }
-            });
+        if (mSuppressContentCallback) {
+            mSuppressContentCallback = false;
+            return;
         }
+
+        // Animate the changing of the tab content by fading pages in and out
+        final Resources res = getResources();
+        final int duration = res.getInteger(R.integer.config_tabTransitionDuration);
+
+        // We post a runnable here because there is a delay while the first page is loading and
+        // the feedback from having changed the tab almost feels better than having it stick
+        post(new Runnable() {
+            @Override
+            public void run() {
+                // Setup the animation buffer
+                Bitmap b = Bitmap.createBitmap(mAppsCustomizePane.getMeasuredWidth(),
+                        mAppsCustomizePane.getMeasuredHeight(), Bitmap.Config.ARGB_8888);
+                Canvas c = new Canvas(b);
+                mAppsCustomizePane.draw(c);
+                mAppsCustomizePane.setAlpha(0f);
+                mAnimationBuffer.setImageBitmap(b);
+                mAnimationBuffer.setAlpha(1f);
+                mAnimationBuffer.setVisibility(View.VISIBLE);
+                c.setBitmap(null);
+                b = null;
+
+                // Toggle the new content
+                onTabChangedStart();
+                onTabChangedEnd(type);
+
+                // Animate the transition
+                ObjectAnimator outAnim = ObjectAnimator.ofFloat(mAnimationBuffer, "alpha", 0f);
+                outAnim.addListener(new AnimatorListenerAdapter() {
+                    @Override
+                    public void onAnimationEnd(Animator animation) {
+                        mAnimationBuffer.setVisibility(View.GONE);
+                        mAnimationBuffer.setImageBitmap(null);
+                    }
+                });
+                ObjectAnimator inAnim = ObjectAnimator.ofFloat(mAppsCustomizePane, "alpha", 1f);
+                inAnim.addListener(new AnimatorListenerAdapter() {
+                    @Override
+                    public void onAnimationEnd(Animator animation) {
+                        if (!LauncherApplication.isScreenLarge()) {
+                            mAppsCustomizePane.flashScrollingIndicator();
+                        }
+                        mAppsCustomizePane.loadAssociatedPages(
+                                mAppsCustomizePane.getCurrentPage());
+                    }
+                });
+                AnimatorSet animSet = new AnimatorSet();
+                animSet.playTogether(outAnim, inAnim);
+                animSet.setDuration(duration);
+                animSet.start();
+            }
+        });
+    }
+
+    public void setCurrentTabFromContent(AppsCustomizePagedView.ContentType type) {
+        mSuppressContentCallback = true;
+        setCurrentTabByTag(getTabTagForContentType(type));
     }
 
     /**
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 59efc9e..6959281 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -246,7 +246,9 @@
 
     private Runnable mBuildLayersRunnable = new Runnable() {
         public void run() {
-            mWorkspace.buildPageHardwareLayers();
+            if (mWorkspace != null) {
+                mWorkspace.buildPageHardwareLayers();
+            }
         }
     };
 
@@ -1260,6 +1262,7 @@
         // Remove all pending runnables
         mHandler.removeMessages(ADVANCE_MSG);
         mHandler.removeMessages(0);
+        mWorkspace.removeCallbacks(mBuildLayersRunnable);
 
         // Stop callbacks from LauncherModel
         LauncherApplication app = ((LauncherApplication) getApplication());
diff --git a/src/com/android/launcher2/LauncherApplication.java b/src/com/android/launcher2/LauncherApplication.java
index ba028ef..755168c 100644
--- a/src/com/android/launcher2/LauncherApplication.java
+++ b/src/com/android/launcher2/LauncherApplication.java
@@ -58,6 +58,7 @@
         filter.addAction(Intent.ACTION_EXTERNAL_APPLICATIONS_AVAILABLE);
         filter.addAction(Intent.ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE);
         filter.addAction(Intent.ACTION_LOCALE_CHANGED);
+        filter.addAction(Intent.ACTION_CONFIGURATION_CHANGED);
         registerReceiver(mModel, filter);
         filter = new IntentFilter();
         filter.addAction(SearchManager.INTENT_GLOBAL_SEARCH_ACTIVITY_CHANGED);
diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java
index fc31d65..3ee2732 100644
--- a/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/android/launcher2/LauncherModel.java
@@ -30,6 +30,7 @@
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.graphics.Bitmap;
@@ -120,6 +121,8 @@
     private static int mCellCountX;
     private static int mCellCountY;
 
+    protected Configuration mPreviousConfig;
+
     public interface Callbacks {
         public boolean setLoadOnResume();
         public int getCurrentWorkspaceScreen();
@@ -146,9 +149,10 @@
         mDefaultIcon = Utilities.createIconBitmap(
                 mIconCache.getFullResDefaultActivityIcon(), app);
 
-        mAllAppsLoadDelay = app.getResources().getInteger(R.integer.config_allAppsBatchLoadDelay);
-
-        mBatchSize = app.getResources().getInteger(R.integer.config_allAppsBatchSize);
+        final Resources res = app.getResources();
+        mAllAppsLoadDelay = res.getInteger(R.integer.config_allAppsBatchLoadDelay);
+        mBatchSize = res.getInteger(R.integer.config_allAppsBatchSize);
+        mPreviousConfig = res.getConfiguration();
     }
 
     public Bitmap getFallbackIcon() {
@@ -612,14 +616,20 @@
             enqueuePackageUpdated(new PackageUpdatedTask(
                         PackageUpdatedTask.OP_UNAVAILABLE, packages));
         } else if (Intent.ACTION_LOCALE_CHANGED.equals(action)) {
-            // If we have changed locale we need to clear out the labels in all apps.
-            // Do this here because if the launcher activity is running it will be restarted.
-            // If it's not running startLoaderFromBackground will merely tell it that it needs
-            // to reload.  Either way, mAllAppsLoaded will be cleared so it re-reads everything
-            // next time.
-            mAllAppsLoaded = false;
-            mWorkspaceLoaded = false;
-            startLoaderFromBackground();
+            // If we have changed locale we need to clear out the labels in all apps/workspace.
+            forceReload();
+        } else if (Intent.ACTION_CONFIGURATION_CHANGED.equals(action)) {
+             // Check if configuration change was an mcc/mnc change which would affect app resources
+             // and we would need to clear out the labels in all apps/workspace. Same handling as
+             // above for ACTION_LOCALE_CHANGED
+             Configuration currentConfig = context.getResources().getConfiguration();
+             if((mPreviousConfig.diff(currentConfig) & ActivityInfo.CONFIG_MCC) != 0){
+                   Log.d(TAG, "Reload apps on config change. curr_mcc:"
+                       + currentConfig.mcc + " prevmcc:" + mPreviousConfig.mcc);
+                   forceReload();
+             }
+             // Update previousConfig
+             mPreviousConfig = currentConfig;
         } else if (SearchManager.INTENT_GLOBAL_SEARCH_ACTIVITY_CHANGED.equals(action) ||
                    SearchManager.INTENT_ACTION_SEARCHABLES_CHANGED.equals(action)) {
             if (mCallbacks != null) {
@@ -631,6 +641,20 @@
         }
     }
 
+    private void forceReload() {
+        synchronized (mLock) {
+            // Stop any existing loaders first, so they don't set mAllAppsLoaded or
+            // mWorkspaceLoaded to true later
+            stopLoaderLocked();
+            mAllAppsLoaded = false;
+            mWorkspaceLoaded = false;
+        }
+        // Do this here because if the launcher activity is running it will be restarted.
+        // If it's not running startLoaderFromBackground will merely tell it that it needs
+        // to reload.
+        startLoaderFromBackground();
+    }
+
     /**
      * When the launcher is in the background, it's possible for it to miss paired
      * configuration changes.  So whenever we trigger the loader from the background
@@ -653,6 +677,20 @@
         }
     }
 
+    // If there is already a loader task running, tell it to stop.
+    // returns true if isLaunching() was true on the old task
+    private boolean stopLoaderLocked() {
+        boolean isLaunching = false;
+        LoaderTask oldTask = mLoaderTask;
+        if (oldTask != null) {
+            if (oldTask.isLaunching()) {
+                isLaunching = true;
+            }
+            oldTask.stopLocked();
+        }
+        return isLaunching;
+    }
+
     public void startLoader(Context context, boolean isLaunching) {
         synchronized (mLock) {
             if (DEBUG_LOADERS) {
@@ -662,14 +700,8 @@
             // Don't bother to start the thread if we know it's not going to do anything
             if (mCallbacks != null && mCallbacks.get() != null) {
                 // If there is already one running, tell it to stop.
-                LoaderTask oldTask = mLoaderTask;
-                if (oldTask != null) {
-                    if (oldTask.isLaunching()) {
-                        // don't downgrade isLaunching if we're already running
-                        isLaunching = true;
-                    }
-                    oldTask.stopLocked();
-                }
+                // also, don't downgrade isLaunching if we're already running
+                isLaunching = isLaunching || stopLoaderLocked();
                 mLoaderTask = new LoaderTask(context, isLaunching);
                 sWorkerThread.setPriority(Thread.NORM_PRIORITY);
                 sWorker.post(mLoaderTask);
@@ -721,10 +753,12 @@
 
             if (!mWorkspaceLoaded) {
                 loadWorkspace();
-                if (mStopped) {
-                    return;
+                synchronized (LoaderTask.this) {
+                    if (mStopped) {
+                        return;
+                    }
+                    mWorkspaceLoaded = true;
                 }
-                mWorkspaceLoaded = true;
             }
 
             // Bind the workspace
@@ -1289,10 +1323,12 @@
             }
             if (!mAllAppsLoaded) {
                 loadAllAppsByBatch();
-                if (mStopped) {
-                    return;
+                synchronized (LoaderTask.this) {
+                    if (mStopped) {
+                        return;
+                    }
+                    mAllAppsLoaded = true;
                 }
-                mAllAppsLoaded = true;
             } else {
                 onlyBindAllApps();
             }
diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index afb2b94..8121d3b 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -1685,6 +1685,10 @@
         }
 
         if (mContentIsRefreshable) {
+            // Force all scrolling-related behavior to end
+            mScroller.forceFinished(true);
+            mNextPage = INVALID_PAGE;
+
             // Update all the pages
             syncPages();