Fixed touch and mouse movement.
Merge commit 'd9c1292'