I'll revert this bit as it's not really relevant to this bug and risky as you note. I think we could tidy up the active app/displayed app distinctions separately.