Merge "ViewGroup: Fix dispatching of generic motion events" into main