Merge "Use reduced transform set for 16x16" into nextgenv2