Merge "Use public OverScroller() instead of a hidden one.."