Merge "Fix wrong divider bar layering" into sc-v2-dev