Handle desktop/laptop w/ touch screens the same way as tablets
Merge pull request #1053 from pgiraud/desktop_touch_screen

Handle desktop/laptop w/ touch screens the same way as tablets