Fixed window switching when paged
Merge branch 'master' into xep-0223
Merge remote-tracking branch 'origin/xep-0223' into xep-0223