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

Change-Id: Ic8a9c38988dd23d0b3c7e1fa96a28a2ffb2f3b6b