Settings: Toggle to disable fullscreen keyboard (2/2)

Conflicts:

	AndroidManifest.xml
	res/values/cm_strings.xml

Conflicts:
	res/values/cm_strings.xml

Change-Id: Ib21a84ca64eef42ce6996b28ca6782f8089f4996