App sidebar [2/2]

Conflicts:

	AndroidManifest.xml
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/xml/system_settings.xml

(cherry picked from commit 0707d59560b30aeee7dc16bf0f9ba6fc5745ff8f)

Conflicts:
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/xml/system_settings.xml
Appbar changes to compile and work with new CM "Display Settings: Better font size control" commit

Change-Id: I3ef5e525a471b07887fa158cc6d6e694984a1cce

Conflicts:

	res/values/attrs.xml

(cherry picked from commit a5daa4519e2120f9727a6814f552b76f5ea1093c)

Conflicts:
	res/values/attrs.xml