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