General fixes

* Fix classcastexception on batterycontroller
* Fix google inet connection icon color (grey - x color)
* Fix clock failing color changes after UI changes without reboot
* Unify a little bit more tablet and phone UX

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java
	packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java