More tweaks to window switching spec to make it pass in CI in all browsers