Merge "TouchEvent (1/n): Adding TouchModeEvent to InputChannel"