Merge "Make variance based partitioning compatible with SEG_LVL_SKIP" into nextgenv2