cherry-pick: Port most changes from `main`#2574

gs-olive merged 2 commits intorelease/2.2pytorch/TensorRT:release/2.2from

staging_rel_2_2pytorch/TensorRT:staging_rel_2_2Copy head branch name to clipboard