Merge "don't code the branch for the predicted seg_id if that flag is false." into experimental