Add missing protection for NSNotFound in the return from globalIndexForItemAtIndexPath
merge conflict
more nsnotfound protections