Merge "test: Fix 036-finalizer test flake on --jvm"