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