Merge "Fix split divider position issue" into sc-dev