Merge "Correctly dump DrawPatch operations in display lists"