am d61ff77e: Merge "Fix ListView is not scrolled properly with arrows"

* commit 'd61ff77ee10b2c956df153e08b850e852ff5df57':
  Fix ListView is not scrolled properly with arrows