Add option to turn off CRT effect [2/2]

Conflicts:
	res/values/pa_strings.xml
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java