Merge "DragScrollListener test, from ag/1247908." into nyc-andromeda-dev