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