Merge "If we can't over scroll horizontally, set vx to 0 in doFling. Otherwise...

Merge "If we can't over scroll horizontally, set vx to 0 in doFling. Otherwise if vx is greater than vy, as we pin x later in onOverscrolled(), the fling doesn't work as expected."