A few changes to allow non-batch updates in collection views, cancel updates if index path is deleted