discovered 2 bugs with the previous patch,
a ) need to properly calculate the topleftmost position for the combined shapes
 in the group
b) when you have groups within groups then the offsets need to be applied to
the topmost parent

Change-Id: I2edc0cccca439b3103b61c8116d1cde1536519da