Merge "Add MAX_VARTX_DEPTH macro" into nextgenv2