Merge "Update corner radius of both snapshot in app pair" into sc-v2-dev