Merge "Notification guts redesign" into qt-dev