Avoid deadlocks in TypeDescriptor#97236

steveharter merged 2 commits intodotnet:maindotnet/runtime:mainfrom

steveharter:ComponentModelHangsteveharter/runtime:ComponentModelHangCopy head branch name to clipboard