Expanded Desktop State update: 4 state version from Slim (1/2)

Change-Id: I8e021802449e1466709a1c0346ea2f85bfa32a61