Merge "Fixing up some folder-related drag and drop bugs"