Merge "Revert "Cleanup embedded Task related code from WindowTestsBase""