Merge "Replace InputEvent with direct use of MotionEvent."