Merge "Refactor recursive transform block decoding" into nextgenv2