[cmd:rename] fix problem of move cursor by touch operation
Merge branch '2.x' into 2.1