Merge "Fix ListViewTest#testDispatchKeyEvent"