Start moving debug code into Activity overlay