Bug 943717 - Refine Instantication of AppWindow and ActivityWindow