Merge change 22773 into eclair

* changes:
  Keep up with latest changes to overlay handling on that unnamable platform.