Merge "Don't explicitly wait for starting-window during tests with shell-transitions" into sc-v2-dev