Bug 936734 - Fix window activity return