Light state machine - part 2

Merged Christian Hitz requested to merge chhitz/dss-mainline:DSD-1031-light-state-machine-2 into master Jan 31, 2019