Intersect DEVSUPPORT-1180: Fix folder drag and drop issues