Merge "Make lighting style and attribute public" into lmp-dev