Merge "Fix wrong Notification refactor" into qt-qpr1-dev