Merge pull request #20958 from maribu/sys/shell/xfa-reduce-overhead

Merge pull request #20958 from maribu/sys/shell/xfa-reduce-overhead #30926