Halo: Add master switch to disable Halo (2/2)
Change-Id: I78942ea1a31b7158172614b9f7baf2255b15db25

(cherry picked from commit 1c20dc35159e1829c0b0dc047a8b4c6d024068d3)
Active display [squashed] (2/2)

Change-Id: If15f748a9bb8ad3b82d7b9944b0b456fdbabd9fe

Conflicts:

	res/values/cr_arrays.xml
	res/values/cr_strings.xml

(cherry picked from commit 7d53e5d336be93f37022e12de19453791415a237)

Conflicts:
	res/values/cr_strings.xml