Merge "Fix cancel notification race condition bug."