Merge "Fix potential flaky debuggerd tests." into main