Merge "Merge "Prevent apps from creating blocked channel groups" into rvc-dev am: fc06439710 am: 5f9f8f23df" into sc-dev