Merge "Fix potential miscellaneous debuggerd issues." into main