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

Change-Id: Id07b8330b9d85a81663ba8ba0154c01421deffab