Merge change 23381 into eclair

* changes:
  Prevent ListView from scrolling/flinging its content when the content fits on screen.