Merge "Fix bug 2574860 - fix AbsListView.trackMotionScroll edge detection" into froyo