Merge "Refactor recursive transform block size decoding" into nextgenv2