Fix collectionview proxy close

Includes better testing for the child view triggers in CollectionView, which allows for a more confident fix for #1101.