Restore NSCollectionView functionality from mac-x2 branch