App sidebar (2/2)

Change-Id: I9aae5e80960e5037e7aa69019004d4dda91f282a
(cherry picked from commit 845a74acdc70a5e5e9e7ace5d7dbedb2630bf30f)

Conflicts:
	res/layout/seek_bar_preference.xml
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/values/custom_strings.xml
	res/xml/system_ui_settings.xml
AppBar Fix