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

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