Merge "Push drag-resize mode to the client" into tm-dev