Merge "Fix bug where dragging icons in folders causes error" into tm-qpr-dev