Merge "API refactoring for OverScroller."