Merge "Close notification guts after applying changes" into qt-dev