Merge "OnScrollListener fix in AbsListView"