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

Change-Id: I77e39a652ea589c88c72e5a5875da74d5bbcd0d1