Merge "Remove unused get_tx1d_width/height wrapper" into nextgenv2