Merge "Add profiling tools."
diff --git a/src/com/android/gallery3d/ui/SlotView.java b/src/com/android/gallery3d/ui/SlotView.java
index 3e0e2f2..16040b7 100644
--- a/src/com/android/gallery3d/ui/SlotView.java
+++ b/src/com/android/gallery3d/ui/SlotView.java
@@ -735,7 +735,8 @@
             setCenterIndex(mStartIndex);
             mStartIndex = INDEX_NONE;
         }
-        updateScrollPosition(WIDE ? mScrollX : mScrollY, true);
+        // Reset the scroll position to avoid scrolling over the updated limit.
+        setScrollPosition(WIDE ? mScrollX : mScrollY);
         return changed;
     }