Merge "Further work on 64x64 fwd/inv transform support" into nextgenv2