Canvas: Unroll groups within groups to a single group.  Closes #1509