pretty much the last severe bug

Change-Id: Idc7d6fde0f682fb115c4bfba17a4916fa8413dd6

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