Merge "Fix the transform type selection in 4x4 partition" into experimental