Merge "Cleanup embedded Task related code from WindowTestsBase"