Merge "Restoring split touch events in workspace with workaround."