Merge "Changed clickAndWaitForNewWindow() to respect the timeout parameter"