Merge "HorizontalScrollView should delay child presses" into ics-mr1