Merge "TouchInputMapper: Fix pointer ID in dispatchPointerMouse"