Bug 846854: making sure that activeWindow getters have the expected window
Merge pull request #828 from erikvold/846854p1

Bug 846854: making sure that activeWindow getters have the expected window r=@Mossop