Merge "Support rectangular transform block units in the codebase" into nextgenv2