Merge branch 'for-4.18/multitouch' into for-linus