Merge "MotionEvent: Ensure addBatch works in the current coordinate space" into main