Merge "Fix for crash when using high bitdepth and var-tx" into nextgenv2