Merge "Prevent Drag n' Drop/Spring-load onto a selected folder." into nyc-andromeda-dev