Merge "Add proper namespace to GraphicTypes." into pi-dev