Revert "Revert "[1/2] Settings: HALO Forward port from jb43.""

This reverts commit 62439f22d66ac2635b5bdd35a6d45ba497270f6d.

Conflicts:
	res/xml/settings_headers.xml