Merge "Add rounded corner tests in the wm test" into sc-dev