Merge "Use the actual transform block size for loop filter selection" into nextgenv2