Don't invalidate list data during layout. am: a9d976f39a
am: 84a0d97b85

Change-Id: I0dc549674ed7e026cbe15ac6d06626305729e7b8