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