Merge "Updates BubbleData sorting and grouping to spec" into qt-dev