Merge "Align rounded corners beside divider bar with display and task bar" into sc-v2-dev