Merge "Fix a stability regression in ListView arrow scrolling" into jb-mr2-dev