Merge "Fix some issues with touch event splitting around event timing"