Merge "Fix issue with manual touch dispatch" into pi-dev