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

This reverts commit fe55abe988d6af9be0e9fe2d938a9e9519c9ff34.
String fixes

... and spanish translations

Change-Id: I5dd049fc443b830b0b7b74e57020253b8c94087a
Small cleanup
Merge remote-tracking branch 'upstream/jellybean' into HEAD