Fix some Z ordering issue

Change-Id: Ib54247785881c93b770a74765cc786954634d87a
Merge topic 'assembly-exporter' into next

8ec3c8f8 Fix some Z ordering issue