Merge "Fix CollectionItemInfo.isHeading for ListView"