Merge "Catch and log exceptions from setup or teardown of WindowTestBase" into pi-dev