Merge "Merge ActivityTestsBase into WindowTestsBase"