Lockscreen see through (2/2)

Conflicts:

	AndroidManifest.xml
	res/values-es/strings.xml
	res/values/strings.xml
	res/xml/settings_headers.xml