Merged touch sets
Merge pull request #1088 from bem/issues/1086@v2

Merged `touch-pad` with `touch-phone` platforms