Active display [squashed] (2/2)

Change-Id: If15f748a9bb8ad3b82d7b9944b0b456fdbabd9fe
Signed-off-by: Chester Kener <Cl3Kener@gmail.com>

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

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

Conflicts:
	res/values/pac_strings.xml

Fix

Signed-off-by: Chester Kener <Cl3Kener@gmail.com>