Merge "Adjust edit state drop targets and workspace scaling per device type and orientation." into tm-dev