Revert "Don't invalidate list data during layout."
am: 866ded50bb

Change-Id: I191c26bfb9488d5d67514a81387a9cde95a20eb4