Illusion
[WIP PS9] Settings: Bringup expanded desktop and implement per-user configuration.

Change-Id: Ib673d278d23423fe6885c73f1eb3dd858633e5b6

Conflicts:
	res/values/cm_strings.xml