Merge "[automerger skipped] Merge "Add a limit on channel group creation" into sc-v2-dev am: a9fbead1f9 -s ours am: 903647e001 -s ours am: f8d21bb25b -s ours"