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

Change-Id: I3df5943f8fc17e1219290bc0e12d29706308d227