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

Change-Id: I02b34aea90cae2312baa5f8300bc8f6349985470