More fixes

Change-Id: I445d619cbdfcf840984b2f55e807344481c32d8f
Merge remote-tracking branch 'pa/jb43' into jellybean-legacy

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