Merge "Change debuggerd client param from pid to tid" into main