Merge "Decoupling some drag and drop code handling" into ub-launcher3-master