Merge "Turn off tx type selection for intra blocks by default" into nextgenv2