Merge "Merge "Revert "Don't invalidate list data during layout."" into nyc-mr1-dev am: 7ffc2a62 am: 9bfdce47 am: a3c03ba7 am: a79c39d5"