active display fix conflict

Change-Id: I50c0a9ca6419fd02557823ea2ec96a5f49c5e703
Active display [squashed] (2/2)

Change-Id: If15f748a9bb8ad3b82d7b9944b0b456fdbabd9fe

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