Halo bug fixes
Merge branch 'cm-10.2-wip' of https://github.com/CyanDreamProject/android_frameworks_base into cm-10.2-wip