Merge "Guard against null data cursor before binding list header"