Fix 10625 reverting addDrawingOrder to previous logic