Merge pull request #226 - Fix touch pads being handled as touch screens