Merge changes I7a1d09eb,Id4c2723a into main

* changes:
  Restore direct display children to display layer
  Always use a DisplayArea for WindowingLayer