Merge "Only reset fling velocity if opposite direction"