Watir sync

This is the Window refactor we did, and a duplicate call that provides a workaround to a ChromeDriver bug.