Merge "Enable optimize_b for intra blocks" into nextgenv2