Merge the X1E PCIe fixes from the fixes branch, to avoid merge conflicts with the addition of PCIe5 and the modem.