Merge "[PIP2] Enable rounded corners" into main