Allow prefetching while data set changed after layout
am: f2f73b7cc9

Change-Id: I2d6a66f4c32fcba9dfd372218b1958f730725457