Merge "Couple fixes for drag and drop" into tm-dev