Merge "[automerger skipped] Merge "Prevent apps from creating blocked channel...

Merge "[automerger skipped] Merge "Prevent apps from creating blocked channel groups" into qt-qpr1-dev am: 59300f17 -s ours am: dc2e9bd1 -s ours am: 93769d75 -s ours am: d9df899d -s ours am: a041ab4f -s ours am: 31257eb6 -s ours am: d0a0322c -s ours"