Merge "Instead of assuming lights are turned off, collect initial state." into sc-dev