App sidebar (2/2)

Change-Id: Ie6ad9a80da257f7aada9c5c08d516e24168cbec6

Conflicts:
	res/values/cr_arrays.xml
	res/values/cr_strings.xml
	res/xml/system_ui_settings.xml
Settings: Inaccurate proximity switch (1/2)

Change-Id: I755b94d2200fb42f2f19fad20b0c9fab29eb1e69

Conflicts:
	res/values/cr_strings.xml
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java