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