Merge "Fix the wrong logging for OVERRIDE_OUTCOME_CANCEL_CLIENT_DISCONNECT" into main