Merge "Update divider bar layout to match stage split design" into sc-v2-dev