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

* commit 'f7ad6948876fe2bfca4589a4dac68fa8ae44d915':

Change-Id: I71069512c28807d3473909b9d265accf5bfdfd81