Merge "Dump the right matrix when logging display lists" into klp-dev