Merge "Fix ListView losing scroll position" into nyc-dev
am: adde076

* commit 'adde076fcba30d1571e985ee36687d3f4300438b':
  Fix ListView losing scroll position

Change-Id: Icec74f7586c950320355bf9642e12d3f666955a3