Merge "Removing redundant {above, left}_seg_context manipulation code."