Merge "Note that View.onTouchEvent is called for touchpad events too" into main