Fixing up some folder-related drag and drop bugs

Change-Id: I712ffd0ccfc0154a5a9e74e3f585157a86986882
4 files changed