Merge "Revert "Extracting LightSensorController from ABC"" into main