Merge "Fixing regression where the source icon becomes visible while dragging" into ub-launcher3-calgary