Merge "DO NOT MERGE: Fixed an issue where the notification icons wouldn't show while docked" into qt-dev