Merge "Revert "Remove the bubble if the notification is no longer FLAG_BUBBLE"" into qt-dev