Halo size (2/2)

Change-Id: I668f454fb082ed7d43222a8d2dad0779c76bdc84

Conflicts:

	res/values/cm_strings.xml