Merge "Allow TouchDelegate to forward non-primary pointer"