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

Fixes #1015.
Please review.