Merge "Add displayId to transferTouch" into tm-dev