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

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