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

Change-Id: Id1f42e0dcb96e9dab884faa5ecd070ced3c4fba2