Merge "Fixing crash with multiple touch pointers"