Merge "Add classification to MotionEvent"