Merge "Fixed an issue where group children had rounded corners" into pi-dev