Settings: Update strings

Change-Id: Ia48ea0db5fe590f90d69114c0e1acddb5f9ab21a
Settings: update default expanded desktop style

Change-Id: I6deb3bdf9a4099c67a63c4afb7909eff24ec574b
Signed-off-by: Roman Birg <roman@cyngn.com>
Merge branch 'cm-11.0' into kk_mkt

Conflicts:
	res/values/cm_strings.xml

Change-Id: Ia5e43012911705b85a696d9fd07f54f0db0c0350