Merge "Fix a bug in AbsListView nested scrolling support."