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

* commit '62c47f0e4107176257e32458be8088e216b7c143':
  Fix ListView losing scroll position

Change-Id: Idb6ceb5fd677a0a0da1d822d6678d0ce4135ec86