Merge "Delay onNotificationUpdated" into qt-dev