Pull in evdevtouch changes from qtbase/stable