Fix #20856: Serialize Waiting and Evaluating as if null.

Fix #20856: Serialize Waiting and Evaluating as if null. #5096