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

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