Merge branch 'jellybean-legacy'
Revert "Halo: Add master switch to disable Halo (1/2)"

This reverts commit 6db25b8853e61a68db98728fa060c2e7dd07a593.
Merge branch 'exp'