am f52ab456: am 65f9e9d4: Merge "Preventing springloaded mode from snapping back due to timeout. (Bug 5649189)" into ics-mr1

* commit 'f52ab456d2d463293074015a02e961cb76134d1d':
  Preventing springloaded mode from snapping back due to timeout. (Bug 5649189)