Revert "Give HALO it own category"

This reverts commit a8b0b5d49d8d62d058350e37b1765d3df1c7a71f.
The FINAL (I hope) reorganization for SystemUISettings