Bug 960516 - WIP to fix App launch issue.