Merge "Cleanup deferred drag when closing deep shortcuts container." into ub-launcher3-calgary