Merge "Fix high bit-depth build with ext-inter and dual-filter exps" into nextgenv2