Merge "Revert "Prevent apps from creating blocked channel groups""