Improve handling of mainThreadPrefix
and remove redundant null check
#34746
+2
−2
Loading