Rework HALO, squashed commit

Change-Id: I0ea15e06c0a01498ba6ec8e3caf09ccb11012f3c
merge changes from CyanogenMod 10.2 into local branch

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

Change-Id: I08036624087dc92ea2128e91a39032b60d91919b