Merge "Take out skip_recode speed feature" into nextgenv2