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

* commit '0946a5805c1b4ad6c9782574e2ebfaaf1b27819c':
  Fix ListView losing scroll position

Change-Id: I2f2effa5e276e33311ed40824b292065be71c4ab