Merge "Fix ListView losing scroll position" into nyc-dev