HALO fixes

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