Merge "Prevent crash in ListView when changing cache hint."