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