Merge "Revert "Revert "Fix ListView is not scrolled properly with arrows""" into jb-mr2-dev