Merge "DO NOT MERGE Prevent apps from creating blocked channel groups" into qt-dev