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