Merge "Add drag icon to folder use case back" into tm-dev