Merge "Change drag from shortcuts to say "Cancel" instead of "Remove"" into ub-launcher3-calgary