Active display [squashed] (2/2)

Change-Id: If15f748a9bb8ad3b82d7b9944b0b456fdbabd9fe

Conflicts:

	res/values/cr_strings.xml

(cherry picked from commit d38b34e048f33ab4010f3ab093cb0c51564a27ba)

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