Merge "Add tmp buffer to rounded corners" into sc-v2-dev