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

Change-Id: I89257f0a2b434016601aac06a9ed8cbbf5be1bd1