Merge "Ensure GetThreadState works with Thread subtypes"