Merge "Fix a merge bug between dual_filter and sub8x8mc" into nextgenv2