Merge "Fix virtual touchpad scroll events." into oc-dr1-dev am: 23970309e2
am: 587778f41d

Change-Id: Ib7b8951e53af415c64ca7b02cc41d7cb6a91c254