Merge change 24455 into eclair

* changes:
  Support for hardware.ini per skin in add-ons.