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

Change-Id: I0c6aacd977ab50acac2b69b9ea86d4039c512987