Merge "Fix for var_tx entropy context with rect_tx" into nextgenv2