Merge "Support potential 2x2 transform block unit" into nextgenv2