(2/2) Settings: instant reboot action trigger

Change-Id: I56969b52b5b875cc345f8e851c8ea88c343ed922

Conflicts:
	res/values/custom_strings.xml
	res/xml/development_prefs.xml