Merge "Remove GROUP_ID; not actively being used by apps." into qt-dev