Merge "Consolidate debug flags for Bubbles." into qt-r1-bubbles-dev