Update QuickSettings

Change-Id: I2da8d9b538cc58f570006c184c9478eae4c9db38

Conflicts:

	res/values/arrays.xml
	res/values/strings.xml