Merge "Fixed that notifications could still get stuck" into qt-dev