Merge "Fix unused variable error in intrapred.c" into nextgenv2