Fix for xstate problems cq 2958
Fix for xstate problems cq 2958

mklight/eCMD,mklight/eCMD,mklight/eCMD,open-power/eCMD,open-power/eCMD,open-power/eCMD,open-power/eCMD,mklight/eCMD,mklight/eCMD,open-power/eCMD