Merge "Rename pick_filter_intra." into nextgenv2