Merge "Don't invalidate list data during layout." into nyc-mr2-dev
am: d1b7d3262b

Change-Id: I869cdb0da5b59bb78d75ea1af2e1f20cae54aa3d