Revert "Active display [squashed] (2/2)"

This reverts commit f688e63d3a6b76c70d5a07c38cbd99b667760685.

Conflicts:
	res/values/cr_arrays.xml
	res/values/cr_strings.xml

Change-Id: Ie10f316567500659222b03319fa841879394a7fb

Conflicts:
	res/values/cr_arrays.xml
	res/values/cr_strings.xml
	res/xml/active_display_settings.xml
	res/xml/screen_and_animations.xml