Merge "Prevent apps from creating blocked channel groups" into sc-v2-dev