Settings: fix volume button swap for tablets (2/2)

Change-Id: Ic65e87b92d997511ac0a43846e0ee1c70fd1a940
Added vibration adjustments via Performance
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>

Change-Id: I32a7571d4d9165ef3956f4f6110776f6b34c3884
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