Merge "Fixed that we could be stuck with notifications pulse expanding" into qt-r1-dev