Merge "Change drag from shortcuts to say "Cancel" instead of "Remove"" into ub-launcher3-calgary am: 1ba0e4df79
am: 1d69de8f77

Change-Id: If5f4a7d6f302ff79edb36e348e1aba041671ed76