Cherry-picks into rel-1.22.0 (#24624)
### Description
Cherry pick the following into
[rel-1.22.0](https://github.com/microsoft/onnxruntime/tree/rel-1.22.0)
- (#24608)
- (#24545)
---------
Co-authored-by: Changming Sun <chasun@microsoft.com>
Co-authored-by: Maximilian Müller <44298237+gedoensmax@users.noreply.github.com>
