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