Merge pull request #90441 from mikeash/rawlayout-reflection-xi-fix