Yeah! TM is back!

Conflicts:
	core/java/com/android/internal/app/ThemeUtils.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java