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

* commit '86a1a245d285410d15f1995b5f72c0d0e566b2e9':
  Revert "Revert "Fix ListView is not scrolled properly with arrows""