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

Change-Id: I5ace1c6b058b795a5b04e48200d2b3d3a1ae2486