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