Lock note

Conflicts:
	res/values/slim_strings.xml
	res/xml/security_settings_lockscreen.xml