* commit '3cdfc4d94f6af82953f0e722ade882197c72da58': Support composite touch / joystick devices better.