Merge "[SegmentControl] Border issue fixed. Unnecessary if check is removed."