Merge "Fix issue where notif wouldn't HUN" into qt-qpr1-dev