Add Color Picker Preference

Change-Id: I397d6a8ab1b7232ab7e62625565e32100cb2a75e

Conflicts:
	res/values/cm_strings.xml