Merge "Revert "Adjust edit state drop targets, workspace scaling, and m..."" into tm-dev