Using DragObject for folder drop instead of maintaining states when drag starts from inside a folder
am: e393d3af36

Change-Id: I44abfbed5ea0a8125b8c5ca50ecdf3a205de8775