Merge "Add buf0, width, height fields to buf_2d" into nextgenv2