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

Change-Id: Ic4f46e51245bc5bc7246b6bc6264a3e8b6ee778f