Merge "Simplify Z reordering logic"