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