am 978f16d2: Merge "Moving item to its old position in folder if DnD is cancelled" into ub-launcher3-burnaby

* commit '978f16d2e3c2e24a3fb6195957899c7556bcf587':
  Moving item to its old position in folder if DnD is cancelled