Merge proposals dependent on lp://staging/~jeremywootten/pantheon-files/fix-1623283-drop-into-wrong-folder

1. fix-1623283-drop-into-wrong-folder
2. Dependent merge proposals