Merge "Merging duplicate logic for deferred drop handling in Worksace and Folder" into ub-launcher3-master