Merge "Revert "Don't invalidate list data during layout." am: 866ded50 am: 96b4a68c am: b8a31442 am: 1b5e3d98"