Change drag from shortcuts to say "Cancel" instead of "Remove"
am: df64e9ee06

Change-Id: I27b16b2f526034b50012b65d032098b75f86a754