Merge "Fix ListView is not scrolled properly with arrows"