Merge "Merge "Revert "Don't invalidate list data during layout."" into nyc-mr1-dev am: 7ffc2a62ff am: 9bfdce4712 am: a3c03ba74a am: a79c39d53e"