Fix ribbon strings and ribbon tile preference

Conflicts:

	res/values/slim_strings.xml
	res/xml/quicksettings_tiles_style.xml