Merge change 5892

* changes:
  Hardware overlay support