Merge "Move icon back to original cell if a quick drag would cause reorder." into ub-launcher3-master