[automerger skipped] Merge "Fix issue with manual touch dispatch" into pi-dev am: 0fb45603fe
am: 926dd4739d  -s ours

Change-Id: I4ec00664226bb57da4829fe1aa4b192b9ce8906e