Merge "Correctly handle intercepted touch events in FastScroller" into mnc-dev