am 072097bd: am 8cc00243: Merge "Keep OverScroller.SplineOverScroller state consistent." into mnc-dev

* commit '072097bd3f2b685b4b21d415c2b70cbca9eb76fd':
  Keep OverScroller.SplineOverScroller state consistent.