Merge "Keep OverScroller.SplineOverScroller state consistent." into mnc-dev