Merge "Remove unused get_intra/inter_scan() from scan.h" into nextgenv2