Merge "Fix some issues in notification bucketing" into qt-dev