Merge changes from topic "new-z-order"

* changes:
  Reimplement DimLayer's using hierarchy.
  Re-implement Z-ordering based off SurfaceControl hierarchy.