Merge "Fix build without dual-filter" into nextgenv2