Merge "Move display id into MotionEvent"