Long press back kill app (2/2)

Conflicts:
	res/values/strings.xml