Merge "Fix virtual touchpad scroll events." into oc-dr1-dev