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