Gesture Anywhere [2/2]

Change-Id: I51ead6cc35684104ecc1211df0a598d1a0b816c1

Conflicts:
	AndroidManifest.xml
	res/values/lab_arrays.xml
	res/values/lab_colors.xml
	res/values/lab_dimens.xml
	res/values/lab_strings.xml
	res/xml/nfc_payment_settings.xml
	res/xml/settings_headers.xml