Moar theme fixes

Change-Id: I893028d00a06d01b613db3365cd507fc824652d5

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java