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

This reverts commit fe55abe988d6af9be0e9fe2d938a9e9519c9ff34.
Settings: Forward port Kill app back long press

Original author: DaneshM

Change-Id: Ide8be24d679d0b3d74bf56b33696dc279de49470

Conflicts:

	res/values/strings.xml