Merge \"Cleanup deferred drag when closing deep shortcuts container.\" into ub-launcher3-calgary
am: 71538da6e2

Change-Id: I683a03e3c72dd3d541ec7d6ee5c14105815cba91