Merge "Improve gdbclient pid handling"