Merge "Make 030-bad-finalizer less flaky by removing timing dependent output"