Merge "Fix bug with AbsListView position scrolling"