Halo (2/2) 
conflicts res/values/arrays.xml
res/values/strings.xml
res/xml/user_interface.xml
src/com/android/settings/rascarlo/UserInterface.java
Halo: Add master switch to disable Halo (2/2)
HALO: Option to pause the underlying app
Halo: merge derp