Merge "Fix a bug in ListView where touch scrolling could skip a data set change" into jb-dev