Merge "Add drawing-order and hint to dump cmd xml output" into main