Bug 208039 - Tweaks to context launching
2 files changed