Merge "Fix divider display issue" into sc-v2-dev