Remove double tap, make long press to enable torch [2/2]

Conflicts:
	res/values/custom_strings.xml

Change-Id: I69ccf5bfabb8d43f9766bfde29b0cc9654517143
Merge "Remove double tap, make long press to enable torch [2/2]" into kk