Merge remote-tracking branch 'sstabellini/xen-fixes' into staging