Merge "Fix issue with manual touch dispatch" into pi-dev
am: 0fb45603fe

Change-Id: I977188732a3866fc84adf3e1ef1b6d65ee4ea410