Settings: Active display [squashed] (2/2)

Conflicts:
	res/values/cr_arrays.xml
	res/values/cr_attrs.xml
	res/values/cr_strings.xml
	res/xml/general_settings.xml
	res/xml/screen_and_animations.xml

Change-Id: I5650a4be90dd9296ccbe402f61859324c07f30b3