am 6d1c4ff2: am c7d12b9d: am b0736fac: Merge "Fix hiccup when dropping in springloaded mode on large ui" into ics-mr1

* commit '6d1c4ff2f3736e7f6da2a1c43e8c45af4b1a4900':
  Fix hiccup when dropping in springloaded mode on large ui