Merge "Ensure the notification is removed when bubble is removed & fix cancel all" into qt-dev