Merge "Fix potential race bug where notification may persist after job finish."