am 4f1a2db3: Merge "Fixing issue where we may continue to restore the wrong page after resetting."

* commit '4f1a2db34498ba6addb0d0307bbd33ab25ddcee1':
  Fixing issue where we may continue to restore the wrong page after resetting.

src/com/android/launcher2/AppsCustomizePagedView.java

@@ -1490,6 +1490,9 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
 
     @Override
     public void reset() {
+        // If we have reset, then we should not continue to restore the previous state
+        mSaveInstanceStateItemIndex = -1;
+
         AppsCustomizeTabHost tabHost = getTabHost();
         String tag = tabHost.getCurrentTabTag();
         if (tag != null) {
@@ -1497,6 +1500,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
                 tabHost.setCurrentTabFromContent(ContentType.Applications);
             }
         }
+
         if (mCurrentPage != 0) {
             invalidatePageData(0);
         }