Cleanup deferred drag when closing deep shortcuts container.
am: b9da46275b

Change-Id: I4f8c11fe12f4daf1c9fb446a936413b769b5de8e