Merge change 21063 into donut

* changes:
  Fix handling of reference XML file in layout files