Settings: Root list: Custom switch text colors, (2/2)

Conflicts:
	core/java/android/provider/Settings.java
Status bar expanded weather: Add an option to colorize all icons, (1/2)

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/Weather.java
Fix build