Merge "Fix dismiss related issues with bubbles:" into qt-r1-bubbles-dev