Merge "Adding drag outlines for dragging out of folders"