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

Change-Id: I90cf9264ede25712ebaeb1b787cc61c2438f35bc