Merge proposals dependent on lp://qastaging/~jeremywootten/pantheon-files/fix-798470-merge-files-to-folder-by-drag-drop

1. fix-798470-merge-files-to-folder-by-drag-drop
2. Dependent merge proposals