Settings: Add Advanced reboot [2/2]
and misc fixs
Change-Id: I59690daf92514dff10543171bb3eba435fa216e5

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