Merge "Fix stuck notifications"