Settings: Fix ambiguous expanded desktop options

Currently, one may interpret "With status bar" as both:
1. With the status bar also hidden
2. With the status bar left untouched

And vice versa with "without status bar". This patch aims to make it
more clear-cut.

Patch Set 2: Re-worded as per David van Tonder's suggestions.

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