Revert "Revert "Halo: Add master switch to disable Halo (2/2)""

This reverts commit cebf92e065b1cb3394ca3430e7b387be2bd381b3.

Conflicts:

	src/com/android/settings/paranoid/Toolbar.java