Merge "Add Builder to LightState." into sc-dev