Merge "qt-r1-bubbles-dev @ build 5835883"