Bug 1096538 - Fix collection editing regressions from app-grouping. r=kgrandon,crdlc