Merge "Fixing drag and drop states" into ub-launcher3-master