Fix build

and Expanded_Desktop biugfix:
Settings: disable expanded desktop on power menu disable

If expanded desktop is enabled while the option for expanded desktop
setting is disabled, expanded desktop will remain active and the user
will not be able to disable expanded desktop without reenabling the
setting.

Change-Id: Ia91e34e5ce9f8680f64b81e5f79c2df6f0639bb2