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