Merge "Turn off 32x32 transform type selection" into nextgenv2