Bug 936729 - Fix window activity return