Abstract and hollow out most of addSVGGroup()

Change-Id: I7842792c092770463d63c323469e6c376a7f2502