Merge "When summary is dismissed, don't remove bubble children" into qt-r1-bubbles-dev