Halo: Add master switch to disable Halo (2/2)
Also did some cleanup.

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

Change-Id: I36b59b46e71e3ff6f9d25fe4b545843144fee5e5
Remove double entry

Change-Id: I4abd0ab837dcbbbebbd00ff26e7a3ff4f449c613