Merge "Fix a bug in OverScroller.setFinalX/Y"