cursor: Don't forget to apply state changes with touch

!478 (merged) handles the pointer case but we also want to handle the case where a surface is touch dragged. While at that clean up a bit around the edges.