Merge "Handle multiple windows in transferTouch" into tm-dev