'Quicktile row option:set 3,4,5 tiles per row (1/2)' Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/quicksettings/QuickSettingsTile.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsContainerView.java

PS2: some fixups for 4.4 compat with vanir

PS3: some more fixups for 4.4 compat with vanir

PS4: fix text padding in tiles but still not perfect but close

PS5: remove single line from layouts
Change-Id: Ie14d08d38c0f562659e12960b8dafaed320ffbd2