Merge "Adjust touch position for handles using window coordinate." into nyc-dev