Settings: Fix ambiguous expanded desktop options - CM


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
Settings: Simplyfiy expanded desktop summary - CM


There is no need to have an extra summary string to display the
state of the expanded desktop mode. This commit removes the unneeded
strings and uses the entries as summary.

Change-Id: Ia7e99ec52577c64d786ef5a0117fb33f5af671ab