Merge "Showing the notification icon properly now when the pulse is suppressed" into qt-dev