Merge changes I23545586,I0512c71e into rvc-dev

* changes:
  Make LogicalLight @Nullable: part two (internal)
  Make LogicalLight @Nullable: part one (external)