[squashed] Halo colors (2/2)

This commit contains:
0abddc6d72
9216abed65
d7af701e52
03f0d22870

Change-Id: I3d2ff2675d02454351004420a777be5b8455ca87

Conflicts:
	res/xml/halo_settings.xml