Some minors changes

Change-Id: I1dc0618423e36e4809368e471e74fef1334f998f
HOVER: Add QS Tile [2/2]

Change-Id: Ide431e64c8bbbb87737469aaaf399fd12c94f135

Conflicts:
	AndroidManifest.xml
	res/values/slim_strings.xml
	src/com/android/settings/slim/quicksettings/QuickSettingsUtil.java