Merge "Fix foreground bubble tests" into qt-r1-bubbles-dev