Merge "Fix divider rounded corner on specific devices" into sc-v2-dev