Fix 10625 reverting addDrawingOrder to previous logic
Merge pull request #1462 from giohappy/master

Fix 10625 reverting addDrawingOrder to previous logic