Merge "Fix draw order for non-RenderNode draw commands"