Settings: use checkbox for expanded desktop setting for devices without navbar

On those devices, there are only two settings an a checkbox would fit better.

Change-Id: I394736dacf7765f7fdda47d6d743d7479bd4de7e
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1