Merge "Change native lights to be consistent with java API." into sc-dev