Merge "Fix testSetDeliveryState_DeferUntilActive." into main