Merge pull request #90482 from tshortli/import-resolution-pretty-stack-trace