Merge "Explicitly remove the task when a bubble is dismissed" into qt-r1-bubbles-dev