Merge "Skip 4x4 transform if maximum possible transform is 32x32" into nextgenv2