Quick unlock for settings + Extras

I adapted the commit of MartinRo (quick unlock) for my settings

Conflicts:
	res/values/ras_strings.xml
	res/xml/system_settings.xml