Merge change 23341 into eclair

* changes:
  Fix replacement-after-add of resource files in overlay.