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

* commit 'c3176ea42b29335cc0dab3f8d078ade6135420da':
  Fix ListView losing scroll position

Change-Id: I38985033f62a826b72af80cc1f9a303b23a9a456