Merge change 23619 into eclair

* changes:
  Add automatic lighting control framework